[perf] Only restrict garnet perf bots to run in 1842.
Change-Id: Iff7578bb07f8a41f999fb73868dc17bf63efc182
diff --git a/recipes/fuchsia_perf.expected/device_tests.json b/recipes/fuchsia_perf.expected/device_tests.json
index 21fdf30..b4abb89 100644
--- a/recipes/fuchsia_perf.expected/device_tests.json
+++ b/recipes/fuchsia_perf.expected/device_tests.json
@@ -889,7 +889,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/botanist/linux-amd64\", \"path\": \".\", \"version\": \"git_revision:824474aef03ad7c27e18c40fe8a5187a742bda1d\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}, {\"key\": \"zone\", \"value\": \"cloud\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"out.tar\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/botanist/linux-amd64\", \"path\": \".\", \"version\": \"git_revision:824474aef03ad7c27e18c40fe8a5187a742bda1d\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json"
],
diff --git a/recipes/fuchsia_perf.py b/recipes/fuchsia_perf.py
index bd7de99..8a8798e 100644
--- a/recipes/fuchsia_perf.py
+++ b/recipes/fuchsia_perf.py
@@ -181,6 +181,14 @@
)
build_artifacts = build.get_artifacts()
+ extra_dimensions = {}
+ # TODO(PT-119): Force perf tests to run on NUCs in 1842. Newer NUCs have
+ # a slightly slower drive which appears to be effecting the large writes
+ # that some perf tests perform.
+ if api.buildbucket.build.builder.builder == 'garnet-x64-perf-dawson_canyon': #pragma: no cover
+ extra_dimensions = {
+ 'zone': 'cloud',
+ }
test_results = api.testing.deprecated_test(
build_artifacts=build_artifacts,
pool=test_pool,
@@ -188,12 +196,7 @@
pave=pave,
test_cmds=test_cmds,
device_type=device_type,
- # TODO(PT-119): Force perf tests to run on NUCs in 1842. Newer NUCs have
- # a slightly slower drive which appears to be effecting the large writes
- # that some perf tests perform.
- extra_dimensions={
- 'zone': 'cloud',
- },
+ extra_dimensions=extra_dimensions,
)
# Upload results for all of the benchmarks that ran successfully.
