diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2017-03-13 15:31:47 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-13 20:10:49 +0000 |
| commit | fcc6ee5ea0713fa145add7311939c45c9d8ae159 (patch) | |
| tree | 8b0e96d8c459cd53b9844d7e6e3138e8cc00ff66 /infra/bots/assets | |
| parent | 6291863daf0f205239c4b0082f401355594a20fe (diff) | |
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>
Diffstat (limited to 'infra/bots/assets')
| -rw-r--r-- | infra/bots/assets/asset_utils.py | 19 | ||||
| -rw-r--r-- | infra/bots/assets/skimage/VERSION | 2 | ||||
| -rw-r--r-- | infra/bots/assets/skp/README.md | 1 | ||||
| -rw-r--r-- | infra/bots/assets/svg/VERSION | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/infra/bots/assets/asset_utils.py b/infra/bots/assets/asset_utils.py index 74407e25ab..3dd34ba2ad 100644 --- a/infra/bots/assets/asset_utils.py +++ b/infra/bots/assets/asset_utils.py @@ -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): diff --git a/infra/bots/assets/skimage/VERSION b/infra/bots/assets/skimage/VERSION index 8fdd954df9..b393560759 100644 --- a/infra/bots/assets/skimage/VERSION +++ b/infra/bots/assets/skimage/VERSION @@ -1 +1 @@ -22
\ No newline at end of file +23
\ No newline at end of file diff --git a/infra/bots/assets/skp/README.md b/infra/bots/assets/skp/README.md new file mode 100644 index 0000000000..6bfc2b663e --- /dev/null +++ b/infra/bots/assets/skp/README.md @@ -0,0 +1 @@ +Humans shouldn't have to call this - the RecreateSKPs bot calls this, e.g. https://skia-review.googlesource.com/c/9515/
\ No newline at end of file diff --git a/infra/bots/assets/svg/VERSION b/infra/bots/assets/svg/VERSION index e440e5c842..bf0d87ab1b 100644 --- a/infra/bots/assets/svg/VERSION +++ b/infra/bots/assets/svg/VERSION @@ -1 +1 @@ -3
\ No newline at end of file +4
\ No newline at end of file |