Move telemetry_unittests to the main waterfall kevin tester.
Looks good on the fyi bot: (ignore the conformance test failures)
https://luci-milo.appspot.com/p/chromium/builders/ci/chromeos-kevin-rel-hw-tests
Bug: 938502
Change-Id: Ifa886afb5c44134d14170fd5967e1ab7d9c89916
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1708753
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: Ben Pastene <bpastene@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678743}
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index b44e1163..2a77f891 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -661,6 +661,34 @@
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
+ },
+ {
+ "args": [
+ "--browser=cros-chrome",
+ "--remote=variable_chromeos_device_hostname",
+ "--jobs=1"
+ ],
+ "isolate_name": "telemetry_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "telemetry_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "kevin",
+ "os": "ChromeOS",
+ "pool": "chrome-cros-dut"
+ }
+ ],
+ "idempotent": false,
+ "shards": 12
+ },
+ "trigger_script": {
+ "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
+ }
}
]
},
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index c663689..fe35dd46 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -6337,34 +6337,6 @@
"isolated_scripts": [
{
"args": [
- "--browser=cros-chrome",
- "--remote=variable_chromeos_device_hostname",
- "--jobs=1"
- ],
- "isolate_name": "telemetry_unittests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "telemetry_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "device_type": "kevin",
- "os": "ChromeOS",
- "pool": "chrome-cros-dut"
- }
- ],
- "idempotent": false,
- "shards": 12
- },
- "trigger_script": {
- "script": "//testing/trigger_scripts/chromeos_device_trigger.py"
- }
- },
- {
- "args": [
"webgl_conformance",
"--show-stdout",
"--browser=cros-chrome",
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 351fc07..0927d1b 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -360,21 +360,6 @@
'cros_browser_sanity_test': {},
},
- 'chromeos_experimental_remote_device_isolated_tests': {
- 'telemetry_unittests': {
- 'args': [
- '--browser=cros-chrome',
- # The magic hostname that resolves to a CrOS device in the test lab.
- '--remote=variable_chromeos_device_hostname',
- '--jobs=1',
- ],
- 'swarming': {
- 'idempotent': False, # https://crbug.com/549140
- 'shards': 12,
- },
- },
- },
-
'chromeos_isolated_scripts': {
'telemetry_perf_unittests': {
'args': [
@@ -417,6 +402,18 @@
'shards': 2,
},
},
+ 'telemetry_unittests': {
+ 'args': [
+ '--browser=cros-chrome',
+ # The magic hostname that resolves to a CrOS device in the test lab.
+ '--remote=variable_chromeos_device_hostname',
+ '--jobs=1',
+ ],
+ 'swarming': {
+ 'idempotent': False, # https://crbug.com/549140
+ 'shards': 12,
+ },
+ },
},
'chromium_android_asan_gtests': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index c1b52c2..3846e7b1 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1624,7 +1624,6 @@
},
'test_suites': {
'gpu_telemetry_tests': 'gpu_chromeos_telemetry_tests',
- 'isolated_scripts': 'chromeos_experimental_remote_device_isolated_tests',
},
'os_type': 'chromeos',
},
