perf: Upload results to gs://skia-perf, not gs://chromium-skia-gm.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2197643002

Review-Url: https://codereview.chromium.org/2197643002

diff --git a/infra/bots/recipe_modules/skia/resources/upload_bench_results.py b/infra/bots/recipe_modules/skia/resources/upload_bench_results.py
index af3e506aee8bfc1302c1542fdfbd97e14595bbf8..25cfcc263130954f272c537b13a90c15886a05ba 100755 (executable)
--- a/infra/bots/recipe_modules/skia/resources/upload_bench_results.py
+++ b/infra/bots/recipe_modules/skia/resources/upload_bench_results.py
@@ -62,7 +62,7 @@ def main(builder_name, build_number, perf_data_dir, got_revision, gsutil_path,
       break
 
   if nanobench_name:
-    dest_gsbase = 'gs://chromium-skia-gm'
+    dest_gsbase = 'gs://skia-perf'
     nanobench_json_file = os.path.join(perf_data_dir,
                                        nanobench_name)
     _UploadJSONResults(builder_name, build_number, dest_gsbase, 'nano-json-v1',

diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
index 05c11535e3b4cb44c91a888268a7bdee35981527..0e600297fa23ad7ddc709ab2bd67afd86d08402a 100644 (file)
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
@@ -904,10 +904,6 @@
       "500"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
-    "env": {
-      "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
-      "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
-    },
     "name": "Upload perf results"
   },
   {

diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 6ff27ea9295d89994b0d1ec57b7dc78e2ca753ca..d2c19db08d317cf1a1bb10cbb73eb630f7b7aed0 100644 (file)
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -419,7 +419,6 @@ def perf_steps_collect(api, task, upload_perf_results, got_revision,
              script=api.skia.resource('upload_bench_results.py'),
              args=upload_args,
              cwd=api.path['checkout'],
-             env=api.skia.gsutil_env('chromium-skia-gm.boto'),
              infra_step=True)