Re-enable uploading to partner bucket
This is a revert of
https://skia.googlesource.com/skia/+/da066b865c1e2777a84a829486a7b37a984484b4
NoTry: true
Bug: skia:6797
Change-Id: I9eca7e4b2234c79e39b2c25aaf459512dd206acc
Reviewed-on: https://skia-review.googlesource.com/23202
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
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 4119fbf..e6b8aae 100644
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -171,7 +171,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 0647f27..8fe002a 100644
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@@ -184,7 +184,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 60b44b6..34e1a84 100644
--- a/infra/bots/recipes/recreate_skps.py
+++ b/infra/bots/recipes/recreate_skps.py
@@ -87,9 +87,8 @@
'--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)