Fix SKP version in tasks.json, make upload_skps.py update tasks.json

infra/bots/upload_skps.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Create a CL to update the SKP version."""
 
 
 import argparse
 import os
 import subprocess
@@ skipping 26 matching lines @@
   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'])
 
+  # 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')])

[rmistry, 2016/10/18 11:49:14]

I do not remember: Is the added file uploaded by another script?

[borenet, 2016/10/18 11:58:15]

git_utils.GitBranch does a commit, so any "git add"ed files are included in the
commit.

 
 
 if '__main__' == __name__:
   parser = argparse.ArgumentParser()
   parser.add_argument("--target_dir")
   args = parser.parse_args()
   main(args.target_dir)