diff options
Diffstat (limited to 'infra/bots/recipe_modules')
4 files changed, 13 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/upload_dm_results/api.py b/infra/bots/recipe_modules/upload_dm_results/api.py index cc395fd722..2cf76995e7 100644 --- a/infra/bots/recipe_modules/upload_dm_results/api.py +++ b/infra/bots/recipe_modules/upload_dm_results/api.py @@ -13,7 +13,6 @@ from recipe_engine import recipe_api DM_JSON = 'dm.json' -GS_BUCKET = 'gs://skia-infra-gm' UPLOAD_ATTEMPTS = 5 VERBOSE_LOG = 'verbose.log' @@ -54,7 +53,7 @@ class UploadDmResultsApi(recipe_api.RecipeApi): self.m.shutil.remove('rm old verbose.log', log_file) # Upload the images. - image_dest_path = '/'.join((GS_BUCKET, 'dm-images-v1')) + image_dest_path = 'gs://%s/dm-images-v1' % self.m.properties['gs_bucket'] files_to_upload = self.m.file.glob( 'find images', results_dir.join('*'), @@ -85,7 +84,8 @@ class UploadDmResultsApi(recipe_api.RecipeApi): summary_dest_path = '/'.join(( 'trybot', summary_dest_path, issue, patchset)) - summary_dest_path = '/'.join((GS_BUCKET, summary_dest_path)) + summary_dest_path = 'gs://%s/%s' % (self.m.properties['gs_bucket'], + summary_dest_path) self.cp('JSON and logs', tmp_dir.join('*'), summary_dest_path, ['-z', 'json,log']) diff --git a/infra/bots/recipe_modules/upload_dm_results/example.py b/infra/bots/recipe_modules/upload_dm_results/example.py index 54448458ab..5e332bf81b 100644 --- a/infra/bots/recipe_modules/upload_dm_results/example.py +++ b/infra/bots/recipe_modules/upload_dm_results/example.py @@ -21,6 +21,7 @@ def GenTests(api): yield ( api.test('normal_bot') + api.properties(buildername=builder, + gs_bucket='skia-infra-gm', revision='abc123', path_config='kitchen') ) @@ -28,6 +29,7 @@ def GenTests(api): yield ( api.test('failed_once') + api.properties(buildername=builder, + gs_bucket='skia-infra-gm', revision='abc123', path_config='kitchen') + api.step_data('upload images', retcode=1) @@ -36,6 +38,7 @@ def GenTests(api): yield ( api.test('failed_all') + api.properties(buildername=builder, + gs_bucket='skia-infra-gm', revision='abc123', path_config='kitchen') + api.step_data('upload images', retcode=1) + @@ -49,6 +52,7 @@ def GenTests(api): yield ( api.test('trybot') + api.properties(buildername=builder, + gs_bucket='skia-infra-gm', revision='abc123', path_config='kitchen', issue='12345', @@ -59,6 +63,7 @@ def GenTests(api): api.test('recipe_with_gerrit_patch') + api.properties( buildername=builder, + gs_bucket='skia-infra-gm', revision='abc123', path_config='kitchen', patch_storage='gerrit') + diff --git a/infra/bots/recipe_modules/upload_nano_results/api.py b/infra/bots/recipe_modules/upload_nano_results/api.py index 515c982527..e215273da3 100644 --- a/infra/bots/recipe_modules/upload_nano_results/api.py +++ b/infra/bots/recipe_modules/upload_nano_results/api.py @@ -41,7 +41,8 @@ class UploadNanoResultsApi(recipe_api.RecipeApi): if issue and patchset: gs_path = '/'.join(('trybot', gs_path, issue, patchset)) - dst = '/'.join(('gs://skia-perf', gs_path, basename)) + dst = '/'.join(( + 'gs://%s' % self.m.properties['gs_bucket'], gs_path, basename)) self.m.step( 'upload', diff --git a/infra/bots/recipe_modules/upload_nano_results/example.py b/infra/bots/recipe_modules/upload_nano_results/example.py index f97cac86f2..7978fd54f6 100644 --- a/infra/bots/recipe_modules/upload_nano_results/example.py +++ b/infra/bots/recipe_modules/upload_nano_results/example.py @@ -21,6 +21,7 @@ def GenTests(api): yield ( api.test('normal_bot') + api.properties(buildername=builder, + gs_bucket='skia-perf', revision='abc123', path_config='kitchen') ) @@ -29,6 +30,7 @@ def GenTests(api): yield ( api.test('trybot') + api.properties(buildername=builder, + gs_bucket='skia-perf', revision='abc123', path_config='kitchen', issue='12345', @@ -39,6 +41,7 @@ def GenTests(api): api.test('recipe_with_gerrit_patch') + api.properties( buildername=builder, + gs_bucket='skia-perf', revision='abc123', path_config='kitchen', patch_storage='gerrit') + |