AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2426863003

Review-Url: https://codereview.chromium.org/2426863003
This commit is contained in:
borenet 2016-10-18 05:20:26 -07:00 committed by Commit bot
parent 311742bd0e
commit 8a91da9459
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/bots/tasks.json
View File

@ -138,7 +138,7 @@
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:10"
"version": "version:12"
},
{
"name": "skia/bots/svg",
@ -185,7 +185,7 @@
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:10"
"version": "version:12"
},
{
"name": "skia/bots/svg",
@ -231,7 +231,7 @@
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:10"
"version": "version:12"
},
{
"name": "skia/bots/svg",

13
infra/bots/upload_skps.py
View File

@ -44,12 +44,25 @@ def main(target_dir):
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')])
if '__main__' == __name__: