diff options
| author |  Ravi Mistry <rmistry@google.com> | 2017-03-20 10:43:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-20 16:14:01 +0000 |
| commit | 25d540fa6e53a4a02afab55fc75da4588b799a8a (patch) | |
| tree | dbd5b8c9fba675887e4d83330aa166a92dec5e17 /infra/bots/upload_skps.py | |
| parent | 480951f618822433874ae45c1ac084419bb79f9d (diff) | |
Enable CIPD automatic GCE authentication and fix upload_skps.py
BUG=skia:6385
Change-Id: I4bb278f99eb3131138a37b7f8752ef404766811e
Reviewed-on: https://skia-review.googlesource.com/9824
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots/upload_skps.py')
| -rw-r--r-- | infra/bots/upload_skps.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/infra/bots/upload_skps.py b/infra/bots/upload_skps.py index a1833dfc0f..dab91303c8 100644 --- a/infra/bots/upload_skps.py +++ b/infra/bots/upload_skps.py @@ -27,12 +27,6 @@ SKIA_REPO = 'https://skia.googlesource.com/skia.git' def main(target_dir, gitcookies): with git_utils.NewGitCheckout(repository=SKIA_REPO): - # Download CIPD. - cipd_sha1 = os.path.join(os.getcwd(), 'infra', 'bots', 'tools', 'luci-go', - 'linux64', 'cipd.sha1') - subprocess.check_call(['download_from_google_storage', '-s', cipd_sha1, - '--bucket', 'chromium-luci']) - # First verify that there are no gen_tasks diffs. gen_tasks = os.path.join(os.getcwd(), 'infra', 'bots', 'gen_tasks.go') try: @@ -45,6 +39,7 @@ def main(target_dir, gitcookies): # Skip GCE Auth in depot_tools/gerrit_utils.py. Use gitcookies instead. os.environ['SKIP_GCE_AUTH_FOR_GIT'] = 'True' os.environ['GIT_COOKIES_PATH'] = gitcookies + os.environ['USE_CIPD_GCE_AUTH'] = 'True' # Upload the new version, land the update CL as the update-skps user. config_dict = { 'user.name': SKIA_COMMITTER_NAME, |