aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar jcgregorio <jcgregorio@google.com>2016-07-29 10:54:30 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-29 10:54:30 -0700
commit01f696e30f775e345d1e378b2c40dd24e3a037c3 (patch)
tree609618bd7007cb5a313fdf12d8ef3b6758214f59 /infra
parentaa8f39402c1b52202cb06e2c1c247ca4bd5e8afc (diff)
perf: Upload results to gs://skia-perf, not gs://chromium-skia-gm.
Diffstat (limited to 'infra')
-rwxr-xr-xinfra/bots/recipe_modules/skia/resources/upload_bench_results.py2
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json4
-rw-r--r--infra/bots/recipes/swarm_trigger.py1
3 files changed, 1 insertions, 6 deletions
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 af3e506aee..25cfcc2631 100755
--- 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 05c11535e3..0e600297fa 100644
--- 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 6ff27ea929..d2c19db08d 100644
--- 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)