From 03234661857747f86e135140c7a92f57561db36d Mon Sep 17 00:00:00 2001 From: Tiancong Wang Date: Wed, 30 Oct 2019 10:16:38 -0700 Subject: Nightly tests: Do not run aquarium stories in telemetry for Arm boards This patch adds a check to skip adding aquarium stories in rendering.desktop if the board is not supported, when creating the experiment files for nightly tests. BUG=None TEST=None Change-Id: I80d5f1ae341d8ee0e41b55c180c6c5c4986a3e33 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1890821 Reviewed-by: Manoj Gupta Legacy-Commit-Queue: Commit Bot Commit-Queue: Tiancong Wang Tested-by: Tiancong Wang --- buildbot_test_toolchains.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'buildbot_test_toolchains.py') diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index e289b1a5..e3ca3196 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -56,6 +56,8 @@ IMAGE_RE_GROUPS = { } TRYBOT_IMAGE_RE = TRYBOT_IMAGE_FS.format(**IMAGE_RE_GROUPS) +TELEMETRY_AQUARIUM_UNSUPPORTED = ['bob', 'elm', 'veyron_minnie'] + class ToolchainComparator(object): """Class for doing the nightly tests work.""" @@ -175,7 +177,8 @@ class ToolchainComparator(object): run_local: False retries: 0 } - + """ + telemetry_aquarium_tests = """ benchmark: rendering.desktop { run_local: False suite: telemetry_Crosperf @@ -195,6 +198,9 @@ class ToolchainComparator(object): f.write(experiment_header) f.write(experiment_tests) + if self.board not in TELEMETRY_AQUARIUM_UNSUPPORTED: + f.write(telemetry_aquarium_tests) + # Now add vanilla to test file. official_image = """ vanilla_image { @@ -277,7 +283,7 @@ class ToolchainComparator(object): print('trybot_url: \ http://cros-goldeneye/chromeos/healthmonitoring/buildDetails?buildbucketId=%s' % buildbucket_id) - if len(trybot_image) == 0: + if not trybot_image: self._l.LogError('Unable to find trybot_image!') return 2 -- cgit v1.2.3