Add all bots running on baremetal pool to waterfalls.pyl.
Bug: webrtc:13899
Change-Id: I0ab6f04b0d5403ddf4340aa17b8de4f9fa82e622
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258022
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36442}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 1ae5934..b37959b 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -410,6 +410,415 @@
}
]
},
+ "Mac64 Release": {
+ "isolated_scripts": [
+ {
+ "isolate_name": "audio_decoder_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "audio_decoder_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
+ },
+ {
+ "isolate_name": "common_audio_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_audio_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
+ },
+ {
+ "isolate_name": "common_video_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_video_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_video:common_video_unittests/"
+ },
+ {
+ "isolate_name": "dcsctp_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "dcsctp_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
+ },
+ {
+ "isolate_name": "low_bandwidth_audio_test",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "low_bandwidth_audio_test",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://audio:low_bandwidth_audio_test/"
+ },
+ {
+ "isolate_name": "modules_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 2
+ },
+ "test_id_prefix": "ninja://modules:modules_tests/"
+ },
+ {
+ "isolate_name": "modules_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://modules:modules_unittests/"
+ },
+ {
+ "isolate_name": "peerconnection_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "peerconnection_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+ },
+ {
+ "isolate_name": "rtc_media_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_media_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://media:rtc_media_unittests/"
+ },
+ {
+ "isolate_name": "rtc_pc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_pc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
+ },
+ {
+ "isolate_name": "rtc_stats_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_stats_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
+ },
+ {
+ "isolate_name": "rtc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://:rtc_unittests/"
+ },
+ {
+ "isolate_name": "system_wrappers_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "system_wrappers_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
+ },
+ {
+ "isolate_name": "test_support_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "test_support_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://test:test_support_unittests/"
+ },
+ {
+ "isolate_name": "tools_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "tools_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "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": "Mac",
+ "pool": "WebRTC-baremetal"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
+ },
+ {
+ "isolate_name": "video_engine_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "video_engine_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://:video_engine_tests/"
+ },
+ {
+ "isolate_name": "voip_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "voip_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:voip_unittests/"
+ },
+ {
+ "isolate_name": "webrtc_nonparallel_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webrtc_nonparallel_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
+ }
+ ]
+ },
"Win32 Release (Clang)": {
"isolated_scripts": [
{
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 17e2e3b..47083e1 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -39,11 +39,30 @@
}
}
},
+ 'mac': {
+ 'swarming': {
+ 'dimensions': {
+ 'os': 'Mac'
+ }
+ }
+ },
+ 'mac11': {
+ 'swarming': {
+ 'dimensions': {
+ 'os': 'Mac-11'
+ }
+ }
+ },
'quick-perf-tests': {
- 'args': [
- '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', '--nologs',
- '--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json'
- ],
+ '$mixin_append': {
+ 'args':
+ ['--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', '--nologs']
+ }
+ },
+ 'resultdb-gtest-json-format': {
+ '$mixin_append': {
+ 'args': ['--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json']
+ },
'resultdb': {
'result_format': 'gtest_json',
'result_file': '${ISOLATED_OUTDIR}/gtest_output.json'
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index f5a8af2..c8cfefa 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -22,15 +22,12 @@
},
},
'quick-perf-tests': {
- 'args': [
- '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/',
- '--nologs',
- '--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json',
- ],
- 'resultdb': {
- 'result_format': 'gtest_json',
- 'result_file': '${ISOLATED_OUTDIR}/gtest_output.json',
- },
+ '$mixin_append': {
+ 'args': [
+ '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/',
+ '--nologs',
+ ],
+ }
},
'linux': {
'swarming': {
@@ -39,6 +36,31 @@
}
}
},
+ 'mac': {
+ 'swarming': {
+ 'dimensions': {
+ 'os': 'Mac'
+ }
+ }
+ },
+ 'mac11': {
+ 'swarming': {
+ 'dimensions': {
+ 'os': 'Mac-11'
+ }
+ }
+ },
+ 'resultdb-gtest-json-format': {
+ '$mixin_append': {
+ 'args': [
+ '--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json',
+ ],
+ },
+ 'resultdb': {
+ 'result_format': 'gtest_json',
+ 'result_file': '${ISOLATED_OUTDIR}/gtest_output.json',
+ },
+ },
'resultdb-json-format': {
'resultdb': {
'result_format': 'json'
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index aea352b..58522f0 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -60,16 +60,55 @@
'mixins': ['linux', 'baremetal-try-pool'],
}
},
+ 'video_capture_tests_mac': {
+ 'video_capture_tests': {
+ 'remove_mixins': ['mac11'],
+ 'mixins': ['mac', 'baremetal-pool'],
+ }
+ },
+ 'video_capture_tests_mac_tryserver': {
+ 'video_capture_tests': {
+ 'remove_mixins': ['mac11'],
+ 'mixins': ['mac', 'baremetal-try-pool'],
+ }
+ },
'video_capture_tests_win': {
'video_capture_tests': {
'remove_mixins': ['win7'],
'mixins': ['win', 'baremetal-pool'],
}
},
+ 'video_capture_tests_win_tryserver': {
+ 'video_capture_tests': {
+ 'remove_mixins': ['win7'],
+ 'mixins': ['win', 'baremetal-try-pool'],
+ }
+ },
'webrtc_perf_tests_linux_tryserver': {
'webrtc_perf_tests': {
'remove_mixins': ['linux-bionic', 'resultdb-json-format'],
- 'mixins': ['linux', 'baremetal-try-pool', 'quick-perf-tests'],
+ 'mixins': [
+ 'linux', 'baremetal-try-pool', 'quick-perf-tests',
+ 'resultdb-gtest-json-format'
+ ],
+ }
+ },
+ 'webrtc_perf_tests_mac_tryserver': {
+ 'webrtc_perf_tests': {
+ 'remove_mixins': ['mac11', 'resultdb-json-format'],
+ 'mixins': [
+ 'mac', 'baremetal-try-pool', 'quick-perf-tests',
+ 'resultdb-gtest-json-format'
+ ],
+ }
+ },
+ 'webrtc_perf_tests_win_tryserver': {
+ 'webrtc_perf_tests': {
+ 'remove_mixins': ['win7', 'resultdb-json-format'],
+ 'mixins': [
+ 'win', 'baremetal-try-pool', 'quick-perf-tests',
+ 'resultdb-gtest-json-format'
+ ],
}
},
},
@@ -83,9 +122,23 @@
'video_capture_tests_linux_tryserver',
'webrtc_perf_tests_linux_tryserver',
],
+ 'desktop_tests_mac': [
+ 'desktop_tests',
+ 'video_capture_tests_mac',
+ ],
+ 'desktop_tests_mac_tryserver': [
+ 'desktop_tests',
+ 'video_capture_tests_mac_tryserver',
+ 'webrtc_perf_tests_mac_tryserver',
+ ],
'desktop_tests_win': [
'desktop_tests',
'video_capture_tests_win',
],
+ 'desktop_tests_win_tryserver': [
+ 'desktop_tests',
+ 'video_capture_tests_win_tryserver',
+ 'webrtc_perf_tests_win_tryserver',
+ ],
},
}
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 625a6a6..389f390 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -437,5 +437,879 @@
"test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
+ },
+ "mac_rel": {
+ "isolated_scripts": [
+ {
+ "isolate_name": "audio_decoder_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "audio_decoder_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
+ },
+ {
+ "isolate_name": "common_audio_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_audio_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
+ },
+ {
+ "isolate_name": "common_video_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_video_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_video:common_video_unittests/"
+ },
+ {
+ "isolate_name": "dcsctp_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "dcsctp_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
+ },
+ {
+ "isolate_name": "low_bandwidth_audio_test",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "low_bandwidth_audio_test",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://audio:low_bandwidth_audio_test/"
+ },
+ {
+ "isolate_name": "modules_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 2
+ },
+ "test_id_prefix": "ninja://modules:modules_tests/"
+ },
+ {
+ "isolate_name": "modules_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://modules:modules_unittests/"
+ },
+ {
+ "isolate_name": "peerconnection_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "peerconnection_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+ },
+ {
+ "isolate_name": "rtc_media_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_media_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://media:rtc_media_unittests/"
+ },
+ {
+ "isolate_name": "rtc_pc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_pc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
+ },
+ {
+ "isolate_name": "rtc_stats_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_stats_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
+ },
+ {
+ "isolate_name": "rtc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://:rtc_unittests/"
+ },
+ {
+ "isolate_name": "system_wrappers_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "system_wrappers_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
+ },
+ {
+ "isolate_name": "test_support_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "test_support_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://test:test_support_unittests/"
+ },
+ {
+ "isolate_name": "tools_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "tools_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "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": "Mac",
+ "pool": "WebRTC-baremetal-try"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
+ },
+ {
+ "isolate_name": "video_engine_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "video_engine_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://:video_engine_tests/"
+ },
+ {
+ "isolate_name": "voip_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "voip_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:voip_unittests/"
+ },
+ {
+ "isolate_name": "webrtc_nonparallel_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webrtc_nonparallel_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-11"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
+ },
+ {
+ "args": [
+ "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--nologs",
+ "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+ ],
+ "isolate_name": "webrtc_perf_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webrtc_perf_tests",
+ "resultdb": {
+ "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac",
+ "pool": "WebRTC-baremetal-try"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:webrtc_perf_tests/"
+ }
+ ]
+ },
+ "win_x86_clang_rel": {
+ "isolated_scripts": [
+ {
+ "isolate_name": "audio_decoder_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "audio_decoder_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
+ },
+ {
+ "isolate_name": "common_audio_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_audio_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
+ },
+ {
+ "isolate_name": "common_video_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "common_video_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://common_video:common_video_unittests/"
+ },
+ {
+ "isolate_name": "dcsctp_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "dcsctp_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
+ },
+ {
+ "isolate_name": "low_bandwidth_audio_test",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "low_bandwidth_audio_test",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://audio:low_bandwidth_audio_test/"
+ },
+ {
+ "isolate_name": "modules_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "shards": 2
+ },
+ "test_id_prefix": "ninja://modules:modules_tests/"
+ },
+ {
+ "isolate_name": "modules_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "modules_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://modules:modules_unittests/"
+ },
+ {
+ "isolate_name": "peerconnection_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "peerconnection_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://pc:peerconnection_unittests/"
+ },
+ {
+ "isolate_name": "rtc_media_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_media_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://media:rtc_media_unittests/"
+ },
+ {
+ "isolate_name": "rtc_pc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_pc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://pc:rtc_pc_unittests/"
+ },
+ {
+ "isolate_name": "rtc_stats_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_stats_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://stats:rtc_stats_unittests/"
+ },
+ {
+ "isolate_name": "rtc_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "rtc_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "shards": 6
+ },
+ "test_id_prefix": "ninja://:rtc_unittests/"
+ },
+ {
+ "isolate_name": "system_wrappers_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "system_wrappers_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/"
+ },
+ {
+ "isolate_name": "test_support_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "test_support_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://test:test_support_unittests/"
+ },
+ {
+ "isolate_name": "tools_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "tools_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "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-try"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
+ },
+ {
+ "isolate_name": "video_engine_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "video_engine_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "shards": 4
+ },
+ "test_id_prefix": "ninja://:video_engine_tests/"
+ },
+ {
+ "isolate_name": "voip_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "voip_unittests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:voip_unittests/"
+ },
+ {
+ "isolate_name": "webrtc_nonparallel_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webrtc_nonparallel_tests",
+ "resultdb": {
+ "result_format": "json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-7-SP1"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:webrtc_nonparallel_tests/"
+ },
+ {
+ "args": [
+ "--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/",
+ "--nologs",
+ "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json"
+ ],
+ "isolate_name": "webrtc_perf_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webrtc_perf_tests",
+ "resultdb": {
+ "result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows",
+ "pool": "WebRTC-baremetal-try"
+ }
+ ]
+ },
+ "test_id_prefix": "ninja://:webrtc_perf_tests/"
+ }
+ ]
}
}
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 9ba64b4..6469de0 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -18,6 +18,13 @@
'isolated_scripts': 'desktop_tests_linux',
},
},
+ 'Mac64 Release': {
+ 'os_type': 'mac',
+ 'mixins': ['mac11', 'x86-64', 'resultdb-json-format'],
+ 'test_suites': {
+ 'isolated_scripts': 'desktop_tests_mac',
+ },
+ },
'Win32 Release (Clang)': {
'os_type': 'win',
'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
@@ -38,6 +45,20 @@
'isolated_scripts': 'desktop_tests_linux_tryserver',
},
},
+ 'mac_rel': {
+ 'os_type': 'mac',
+ 'mixins': ['mac11', 'x86-64', 'resultdb-json-format'],
+ 'test_suites': {
+ 'isolated_scripts': 'desktop_tests_mac_tryserver',
+ },
+ },
+ 'win_x86_clang_rel': {
+ 'os_type': 'win',
+ 'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
+ 'test_suites': {
+ 'isolated_scripts': 'desktop_tests_win_tryserver',
+ },
+ },
},
},
]