Add Gerrit support to RecreateSKPs

Tested by modifying Canary builder to upload a CL: https://task-scheduler.skia.org/job/20161122T163246.824881948Z_00000000000039de
The above uploaded Gerrit CL: https://skia-review.googlesource.com/c/5140/

BUG=skia:5979

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4889

Change-Id: I5527c9d4219b879d5220136949704ea0fc556f85
Reviewed-on: https://skia-review.googlesource.com/4889
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

1 files changed, 44 insertions, 37 deletions

diff --git a/infra/bots/upload_skps.py b/infra/bots/upload_skps.py
index 7d0b0798ef..3ec0f7022b 100644
--- a/infra/bots/upload_skps.py
+++ b/infra/bots/upload_skps.py
@@ -9,61 +9,68 @@ import argparse
 import os
 import subprocess
 import sys
+import urllib2
 
 import git_utils
 
-
 CHROMIUM_SKIA = 'https://chromium.googlesource.com/skia.git'
+SKIA_COMMITTER_EMAIL = 'update-skps@skia.org'
+SKIA_COMMITTER_NAME = 'UpdateSKPs'
 COMMIT_MSG = '''Update SKP version
 
 Automatic commit by the RecreateSKPs bot.
 
-TBR=
+TBR=%s
 NO_MERGE_BUILDS
-'''
-SKIA_COMMITTER_EMAIL = 'skia.buildbots@gmail.com'
-SKIA_COMMITTER_NAME = 'skia.buildbots'
+''' % SKIA_COMMITTER_EMAIL
 SKIA_REPO = 'https://skia.googlesource.com/skia.git'
 
 
-def main(target_dir):
-  subprocess.check_call(['git', 'config', '--local', 'user.name',
-                         SKIA_COMMITTER_NAME])
-  subprocess.check_call(['git', 'config', '--local', 'user.email',
-                         SKIA_COMMITTER_EMAIL])
-  if CHROMIUM_SKIA in subprocess.check_output(['git', 'remote', '-v']):
-    subprocess.check_call(['git', 'remote', 'set-url', 'origin', SKIA_REPO,
-                           CHROMIUM_SKIA])
+def main(target_dir, gitcookies):
+  with git_utils.NewGitCheckout(repository=CHROMIUM_SKIA):
+    if CHROMIUM_SKIA in subprocess.check_output(['git', 'remote', '-v']):
+      subprocess.check_call(['git', 'remote', 'set-url', 'origin', SKIA_REPO,
+                             CHROMIUM_SKIA])
 
-  # 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'])
+    # 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:
-    subprocess.check_call(['go', 'run', gen_tasks, '--test'])
-  except subprocess.CalledProcessError as e:
-    print >> sys.stderr, ('gen_tasks.go failed, not uploading SKP update:\n\n%s'
-                          % e.output)
-    sys.exit(1)
+    # First verify that there are no gen_tasks diffs.
+    gen_tasks = os.path.join(os.getcwd(), 'infra', 'bots', 'gen_tasks.go')
+    try:
+      subprocess.check_call(['go', 'run', gen_tasks, '--test'])
+    except subprocess.CalledProcessError as e:
+      print >> sys.stderr, (
+         'gen_tasks.go failed, not uploading SKP update:\n\n%s' % e.output)
+      sys.exit(1)
 
-  # Upload the new version, land the update CL.
-  with git_utils.GitBranch(branch_name='update_skp_version',
-                           commit_msg=COMMIT_MSG,
-                           commit_queue=True):
-    upload_script = os.path.join(
-        os.getcwd(), 'infra', 'bots', 'assets', 'skp', 'upload.py')
-    subprocess.check_call(['python', upload_script, '-t', target_dir])
-    subprocess.check_call(['go', 'run', gen_tasks])
-    subprocess.check_call([
-        'git', 'add', os.path.join('infra', 'bots', 'tasks.json')])
+    # 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
+    # Upload the new version, land the update CL as the update-skps user.
+    config_dict = {
+      'user.name': SKIA_COMMITTER_NAME,
+      'user.email': SKIA_COMMITTER_EMAIL,
+      'http.cookiefile': gitcookies,
+    }
+    with git_utils.GitLocalConfig(config_dict):
+      with git_utils.GitBranch(branch_name='update_skp_version',
+                               commit_msg=COMMIT_MSG,
+                               commit_queue=True):
+        upload_script = os.path.join(
+            os.getcwd(), 'infra', 'bots', 'assets', 'skp', 'upload.py')
+        subprocess.check_call(['python', upload_script, '-t', target_dir])
+        subprocess.check_call(['go', 'run', gen_tasks])
+        subprocess.check_call([
+            'git', 'add', os.path.join('infra', 'bots', 'tasks.json')])
 
 
 if '__main__' == __name__:
   parser = argparse.ArgumentParser()
   parser.add_argument("--target_dir")
+  parser.add_argument("--gitcookies")
   args = parser.parse_args()
-  main(args.target_dir)
+  main(args.target_dir, args.gitcookies)