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>

infra/bots/cfg.json

@@ -1,4 +1,6 @@
 {
+  "gs_bucket_gm": "skia-infra-gm",
+  "gs_bucket_nano": "skia-perf",
   "pool": "Skia",
   "no_upload": [
     "ASAN",

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,

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'])

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') +

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',

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') +

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')
   )

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')
   )