Default to no compression for CIPD assets and use depot_tools's CIPD exe
Using no compression can save up to a minute of overhead on the RPIs, for a ~10% increase in file size to download, a great tradeoff. This commit also regenerates svg and skimage to use no compression. The next time RecreateSKPs is run, it will pick up the no-compression. BUG=skia: Change-Id: I7887e0f8152548185fe095c1f05b08696ab055ec Reviewed-on: https://skia-review.googlesource.com/9630 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
parent
6291863daf
commit
fcc6ee5ea0
@ -47,15 +47,9 @@ ZIP_BLACKLIST = ['.git', '.svn', '*.pyc', '.DS_STORE']
|
||||
class CIPDStore(object):
|
||||
"""Wrapper object for CIPD."""
|
||||
def __init__(self, cipd_url=DEFAULT_CIPD_SERVICE_URL):
|
||||
cipd = 'cipd'
|
||||
platform = 'linux64'
|
||||
if sys.platform == 'darwin':
|
||||
platform = 'mac64'
|
||||
elif sys.platform == 'win32':
|
||||
platform = 'win64'
|
||||
cipd = 'cipd.exe'
|
||||
self._cipd_path = os.path.join(INFRA_BOTS_DIR, 'tools', 'luci-go', platform)
|
||||
self._cipd = os.path.join(self._cipd_path, cipd)
|
||||
self._cipd = 'cipd'
|
||||
if sys.platform == 'win32':
|
||||
self._cipd = 'cipd.exe'
|
||||
self._cipd_url = cipd_url
|
||||
self._check_setup()
|
||||
|
||||
@ -64,10 +58,8 @@ class CIPDStore(object):
|
||||
try:
|
||||
subprocess.check_call([self._cipd, 'auth-info'])
|
||||
except OSError:
|
||||
cipd_sha1_path = os.path.join(self._cipd_path, 'cipd.sha1')
|
||||
raise Exception('CIPD binary not found in %s. You may need to run:\n\n'
|
||||
'$ download_from_google_storage -s %s'
|
||||
' --bucket chromium-luci' % (self._cipd, cipd_sha1_path))
|
||||
raise Exception('CIPD binary not found on your path (typically in '
|
||||
'depot_tools). You may need to update depot_tools.')
|
||||
except subprocess.CalledProcessError:
|
||||
raise Exception('CIPD not authenticated. You may need to run:\n\n'
|
||||
'$ %s auth-login' % self._cipd)
|
||||
@ -123,6 +115,7 @@ class CIPDStore(object):
|
||||
'--in', target_dir,
|
||||
'--tag', TAG_PROJECT_SKIA,
|
||||
'--tag', TAG_VERSION_TMPL % version,
|
||||
'--compression-level', '0',
|
||||
])
|
||||
|
||||
def download(self, name, version, target_dir):
|
||||
|
@ -1 +1 @@
|
||||
22
|
||||
23
|
1
infra/bots/assets/skp/README.md
Normal file
1
infra/bots/assets/skp/README.md
Normal file
@ -0,0 +1 @@
|
||||
Humans shouldn't have to call this - the RecreateSKPs bot calls this, e.g. https://skia-review.googlesource.com/c/9515/
|
@ -1 +1 @@
|
||||
3
|
||||
4
|
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
ebb43b0bf38a3ab7bbc2eaff38ec386e60fc7d99
|
@ -1 +0,0 @@
|
||||
2097f9871e58d4d2d9903d0e5e7de5eac96744af
|
@ -1 +0,0 @@
|
||||
6ed0882aa8ba415aec5ff69a7cfdeaeaf60be9ed
|
Loading…
Reference in New Issue
Block a user