From 0f3942fc247cb541a7327b6335054694d7b8e186 Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Thu, 6 Jul 2017 21:00:13 +0000 Subject: [PATCH] Revert "Temporarily stop uploading to partner bucket in RecreateSKPs bot" This reverts commit 6945c946ea800b7bff31920914a990c88a706718. Reason for revert: Should be able to upload to partner bucket now Original change's description: > Temporarily stop uploading to partner bucket in RecreateSKPs bot > > Bug: skia:6797 > Change-Id: I812837d02b90b78b6df3980649ccf6362e939afc > Reviewed-on: https://skia-review.googlesource.com/20820 > Commit-Queue: Ravi Mistry > Reviewed-by: Eric Boren TBR=borenet@google.com,rmistry@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia:6797 Change-Id: I145275da0050da01fca3e6e9c3c5efd84bdadea1 Reviewed-on: https://skia-review.googlesource.com/21738 Reviewed-by: Ravi Mistry Commit-Queue: Ravi Mistry --- .../Housekeeper-Weekly-RecreateSKPs.json | 3 ++- infra/bots/recipes/recreate_skps.expected/failed_upload.json | 3 ++- infra/bots/recipes/recreate_skps.py | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index b37bed4bf5..26786146cf 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -208,7 +208,8 @@ "--browser_executable", "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", - "[START_DIR]/skp_output" + "[START_DIR]/skp_output", + "--upload_to_partner_bucket" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 6509b7ad3c..2155c65b8e 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -208,7 +208,8 @@ "--browser_executable", "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", - "[START_DIR]/skp_output" + "[START_DIR]/skp_output", + "--upload_to_partner_bucket" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/recreate_skps.py b/infra/bots/recipes/recreate_skps.py index efb9c5ed7b..1d4968605f 100644 --- a/infra/bots/recipes/recreate_skps.py +++ b/infra/bots/recipes/recreate_skps.py @@ -68,9 +68,8 @@ def RunSteps(api): '--chrome_src_path', src_dir, '--browser_executable', src_dir.join('out', 'Release', 'chrome'), '--target_dir', output_dir] - # TODO(rmistry): Uncomment the below after skbug.com/6797 is fixed. - # if 'Canary' not in api.properties['buildername']: - # cmd.append('--upload_to_partner_bucket') + if 'Canary' not in api.properties['buildername']: + cmd.append('--upload_to_partner_bucket') with api.context(cwd=api.vars.skia_dir): api.run(api.step, 'Recreate SKPs', cmd=cmd)