Make recipes upload results to bucket specified in top-level config

BUG=skia:6070

Change-Id: I67c040239ca2cf77a7430aa1a45b1bb69fef3b91
Reviewed-on: https://skia-review.googlesource.com/8069
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

9 files changed, 295 insertions, 142 deletions

diff --git a/infra/bots/cfg.json b/infra/bots/cfg.json
index ffb5f9bdd2..048e4b45dd 100644
--- a/infra/bots/cfg.json
+++ b/infra/bots/cfg.json
@@ -1,4 +1,6 @@
 {
+  "gs_bucket_gm": "skia-infra-gm",
+  "gs_bucket_nano": "skia-perf",
   "pool": "Skia",
   "no_upload": [
     "ASAN",
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 68cd362877..440008c47f 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -45,8 +45,10 @@ var (
 
 	// General configuration information.
 	CONFIG struct {
-		NoUpload []string `json:"no_upload"`
-		Pool     string   `json:"pool"`
+		GsBucketGm   string   `json:"gs_bucket_gm"`
+		GsBucketNano string   `json:"gs_bucket_nano"`
+		NoUpload     []string `json:"no_upload"`
+		Pool         string   `json:"pool"`
 	}
 
 	// Mapping of human-friendly GPU names to PCI IDs.
@@ -425,6 +427,7 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
 				fmt.Sprintf("patch_storage=%s", specs.PLACEHOLDER_PATCH_STORAGE),
 				fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE),
 				fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET),
+				fmt.Sprintf("gs_bucket=%s", CONFIG.GsBucketGm),
 			},
 			Isolate:  "upload_dm_results.isolate",
 			Priority: 0.8,
@@ -495,6 +498,7 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
 				fmt.Sprintf("patch_storage=%s", specs.PLACEHOLDER_PATCH_STORAGE),
 				fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE),
 				fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET),
+				fmt.Sprintf("gs_bucket=%s", CONFIG.GsBucketNano),
 			},
 			Isolate:  "upload_nano_results.isolate",
 			Priority: 0.8,
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') +
diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py
index 866c8e22f6..c161225d1f 100644
--- a/infra/bots/recipes/upload_dm_results.py
+++ b/infra/bots/recipes/upload_dm_results.py
@@ -20,6 +20,7 @@ def GenTests(api):
   yield (
     api.test('upload') +
     api.properties(buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
+                   gs_bucket='skia-infra-gm',
                    revision='abc123',
                    path_config='kitchen')
   )
diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py
index 26fe666722..4929efaedb 100644
--- a/infra/bots/recipes/upload_nano_results.py
+++ b/infra/bots/recipes/upload_nano_results.py
@@ -20,6 +20,7 @@ def GenTests(api):
   yield (
     api.test('upload') +
     api.properties(buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
+                   gs_bucket='skia-perf',
                    revision='abc123',
                    path_config='kitchen')
   )
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d13f0ab757..47176834cb 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -13322,7 +13322,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13351,7 +13352,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13380,7 +13382,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13409,7 +13412,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13438,7 +13442,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13467,7 +13472,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13496,7 +13502,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13525,7 +13532,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13554,7 +13562,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13583,7 +13592,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13612,7 +13622,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13641,7 +13652,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13670,7 +13682,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13699,7 +13712,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13728,7 +13742,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13757,7 +13772,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13786,7 +13802,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13815,7 +13832,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13844,7 +13862,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13873,7 +13892,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13902,7 +13922,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13931,7 +13952,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13960,7 +13982,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -13989,7 +14012,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14018,7 +14042,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14047,7 +14072,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14076,7 +14102,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14105,7 +14132,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14134,7 +14162,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14163,7 +14192,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14192,7 +14222,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14221,7 +14252,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14250,7 +14282,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14279,7 +14312,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14308,7 +14342,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14337,7 +14372,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14366,7 +14402,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14395,7 +14432,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14424,7 +14462,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14453,7 +14492,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14482,7 +14522,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14511,7 +14552,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14540,7 +14582,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14569,7 +14612,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
       ],
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
@@ -14598,7 +14642,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14627,7 +14672,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14656,7 +14702,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14685,7 +14732,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14714,7 +14762,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14743,7 +14792,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14772,7 +14822,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14801,7 +14852,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14830,7 +14882,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14859,7 +14912,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14888,7 +14942,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14917,7 +14972,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14946,7 +15002,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -14975,7 +15032,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15004,7 +15062,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15033,7 +15092,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15062,7 +15122,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15091,7 +15152,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15120,7 +15182,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15149,7 +15212,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15178,7 +15242,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15207,7 +15272,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15236,7 +15302,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15265,7 +15332,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15294,7 +15362,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15323,7 +15392,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15352,7 +15422,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15381,7 +15452,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15410,7 +15482,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15439,7 +15512,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15468,7 +15542,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15497,7 +15572,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15526,7 +15602,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15555,7 +15632,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15584,7 +15662,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15613,7 +15692,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15642,7 +15722,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15671,7 +15752,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15700,7 +15782,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15729,7 +15812,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15758,7 +15842,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15787,7 +15872,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15816,7 +15902,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15845,7 +15932,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15874,7 +15962,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15903,7 +15992,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15932,7 +16022,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15961,7 +16052,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -15990,7 +16082,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16019,7 +16112,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16048,7 +16142,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16077,7 +16172,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16106,7 +16202,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16135,7 +16232,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16164,7 +16262,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16193,7 +16292,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16222,7 +16322,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16251,7 +16352,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16280,7 +16382,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16309,7 +16412,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16338,7 +16442,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16367,7 +16472,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16396,7 +16502,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16425,7 +16532,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16454,7 +16562,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16483,7 +16592,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16512,7 +16622,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16541,7 +16652,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16570,7 +16682,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16599,7 +16712,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16628,7 +16742,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16657,7 +16772,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16686,7 +16802,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16715,7 +16832,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16744,7 +16862,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16773,7 +16892,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16802,7 +16922,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16831,7 +16952,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16860,7 +16982,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16889,7 +17012,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16918,7 +17042,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16947,7 +17072,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -16976,7 +17102,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17005,7 +17132,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17034,7 +17162,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17063,7 +17192,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17092,7 +17222,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17121,7 +17252,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17150,7 +17282,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17179,7 +17312,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17208,7 +17342,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
@@ -17237,7 +17372,8 @@
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
         "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8