Fix bots failure when migrating to waterfalls.pyl.
An assert that the same tests are running before and after the migration is failing.
The new config was adding "video_capture_test".
Also add bot 'Android64 Builder arm64' instead of 'Android32 Builder arm64'.
Bug: webrtc:13899
Change-Id: Ic87576ab9740c0dc138f0b087e97ee0ae4be3376
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258138
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36484}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 1787f87..be876a1 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -1278,46 +1278,6 @@
}
]
},
- "Android32 Builder arm64": {
- "gtest_tests": [
- {
- "args": [
- "--android",
- "--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "low_bandwidth_audio_perf_test"
- ],
- "script": "//tools_webrtc/perf/process_perf_results_py2.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "low_bandwidth_audio_perf_test",
- "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
- },
- {
- "args": [
- "--nologs"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "webrtc_perf_tests"
- ],
- "script": "//tools_webrtc/perf/process_perf_results_py2.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true
- },
- "test": "webrtc_perf_tests",
- "test_id_prefix": "ninja://:webrtc_perf_tests/"
- }
- ]
- },
"Android32 Builder x86": {},
"Android32 Builder x86 (dbg)": {},
"Android64 (M Nexus5X)": {
@@ -2522,6 +2482,46 @@
}
]
},
+ "Android64 Builder arm64": {
+ "gtest_tests": [
+ {
+ "args": [
+ "--android",
+ "--adb-path",
+ "../../third_party/android_sdk/public/platform-tools/adb"
+ ],
+ "merge": {
+ "args": [
+ "--test-suite",
+ "low_bandwidth_audio_perf_test"
+ ],
+ "script": "//tools_webrtc/perf/process_perf_results_py2.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
+ "test": "low_bandwidth_audio_perf_test",
+ "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
+ },
+ {
+ "args": [
+ "--nologs"
+ ],
+ "merge": {
+ "args": [
+ "--test-suite",
+ "webrtc_perf_tests"
+ ],
+ "script": "//tools_webrtc/perf/process_perf_results_py2.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
+ "test": "webrtc_perf_tests",
+ "test_id_prefix": "ninja://:webrtc_perf_tests/"
+ }
+ ]
+ },
"Android64 Builder x64 (dbg)": {},
"Linux (more configs)": {
"isolated_scripts": [
@@ -2871,28 +2871,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -3280,28 +3258,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -3689,28 +3645,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -4098,28 +4032,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -4507,28 +4419,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -4916,28 +4806,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -5326,28 +5194,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -5775,28 +5621,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -6611,29 +6435,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -7090,29 +6891,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -7927,28 +7705,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "arm64-64-Apple_M1",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -8814,28 +8570,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index b6836d0..194ab92 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -5464,28 +5464,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -5879,28 +5857,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -6289,28 +6245,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -6724,28 +6658,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -7570,28 +7482,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -7979,28 +7869,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -8388,28 +8256,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -8797,28 +8643,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -9206,28 +9030,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -9630,29 +9432,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -10060,29 +9839,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -10488,28 +10244,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "arm64-64-Apple_M1",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -11352,28 +11086,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "arm64-64-Apple_M1",
- "os": "Mac",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -11764,28 +11476,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -12177,28 +11867,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -12586,28 +12254,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -12995,28 +12641,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
@@ -13404,28 +13028,6 @@
"test_id_prefix": "ninja://rtc_tools:tools_unittests/"
},
{
- "isolate_name": "video_capture_tests",
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_capture_tests",
- "resultdb": {
- "result_format": "json"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Windows",
- "pool": "WebRTC-baremetal"
- }
- ]
- },
- "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
- },
- {
"isolate_name": "video_engine_tests",
"merge": {
"args": [],
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 2af2209..36fb01b 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -45,11 +45,6 @@
'gtest_tests': 'android_perf_tests',
},
},
- 'Android32 Builder arm64': {
- 'test_suites': {
- 'gtest_tests': 'android_perf_tests',
- },
- },
'Android32 Builder x86': {},
'Android32 Builder x86 (dbg)': {},
'Android64 (M Nexus5X)': {
@@ -72,6 +67,11 @@
'junit_tests': 'android_junit_tests',
},
},
+ 'Android64 Builder arm64': {
+ 'test_suites': {
+ 'gtest_tests': 'android_perf_tests',
+ },
+ },
'Android64 Builder x64 (dbg)': {},
'Linux (more configs)': {
'os_type': 'linux',
@@ -84,42 +84,42 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux MSan': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux Tsan v2': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux UBSan': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux UBSan vptr': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux32 Debug': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux32 Debug (ARM)': {},
@@ -127,7 +127,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux32 Release (ARM)': {},
@@ -141,7 +141,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Linux64 Debug (ARM)': {},
@@ -158,7 +158,7 @@
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Mac64 Builder': {
@@ -172,7 +172,7 @@
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Mac64 Release': {
@@ -186,7 +186,7 @@
'os_type': 'mac',
'mixins': ['mac-m1', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Win (more configs)': {
@@ -214,7 +214,7 @@
'os_type': 'win',
'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'Win64 Debug (Clang)': {},
@@ -510,7 +510,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_compile_arm64_dbg': {},
@@ -523,7 +523,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_libfuzzer_rel': {},
@@ -531,7 +531,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_more_configs': {
@@ -545,7 +545,7 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_rel': {
@@ -559,42 +559,42 @@
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_ubsan': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_ubsan_vptr': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_x86_dbg': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'linux_x86_rel': {
'os_type': 'linux',
'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'linux_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'mac_asan': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'mac_compile_dbg': {},
@@ -603,14 +603,14 @@
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'mac_dbg_m1': {
'os_type': 'mac',
'mixins': ['mac-m1', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'mac_rel': {
@@ -624,14 +624,14 @@
'os_type': 'mac',
'mixins': ['mac-m1', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'mac_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_asan': {
'os_type': 'win',
'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_compile_x64_clang_dbg': {},
@@ -642,28 +642,28 @@
'os_type': 'win',
'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_x64_clang_dbg_win10': {
'os_type': 'win',
'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_x64_clang_rel': {
'os_type': 'win',
'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_x86_clang_dbg': {
'os_type': 'win',
'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
'test_suites': {
- 'isolated_scripts': 'win_tests',
+ 'isolated_scripts': 'desktop_tests',
},
},
'win_x86_clang_rel': {
