admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mac11_or_mac12 dimension and apply to all MacOS bots in prep for upgrade

Browse Source 
Bug: b/233192409
Change-Id: I65b65ca4f992eef8d0ebc8e1dac90c656269db17
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265662
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Christoffer Jansson <jansson@google.com>
Cr-Commit-Position: refs/heads/main@{#37208}
This commit is contained in:
Christoffer Jansson 2022-06-14 13:39:29 +02:00 committed by WebRTC LUCI CQ
parent 3de806535a
commit b137fb93e8
5 changed files with 354 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
infra/specs/client.webrtc.json
View File

File diff suppressed because it is too large Load Diff

7
infra/specs/mixins.pyl
View File

@ -171,6 +171,13 @@
}
}
},
'mac11_or_mac12': {
'swarming': {
'dimensions': {
'os': 'Mac-11|Mac-12'
}
}
},
'mac_12_beta_arm64': {
'swarming': {
'dimensions': {

7
infra/specs/mixins_webrtc.pyl
View File

@ -154,6 +154,13 @@
}
}
},
'mac11_or_mac12': {
'swarming': {
'dimensions': {
'os': 'Mac-11|Mac-12'
}
}
},
'perf-low-bandwidth-audio-perf-test': {
'merge': {
'script': '//tools_webrtc/perf/process_perf_results_py2.py',

312
infra/specs/tryserver.webrtc.json
View File

File diff suppressed because it is too large Load Diff

82
infra/specs/waterfalls.pyl
View File

@ -142,23 +142,27 @@
'Linux64 Release (ARM)': {},
'Linux64 Release (Libfuzzer)': {},
'Mac Asan': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
'os_type':
'mac',
'mixins':
['mac11_or_mac12', 'x86-64', 'cores-12', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
},
'Mac64 Builder': {},
'Mac64 Debug': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
'os_type':
'mac',
'mixins':
['mac11_or_mac12', 'x86-64', 'cores-12', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
},
'Mac64 Release': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format'],
'mixins': ['mac11_or_mac12', 'x86-64', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'mac_tests',
},
@ -166,8 +170,10 @@
'MacARM64 M1 Release': {
'os_type':
'mac',
'mixins':
['mac11', 'mac-m1-cpu', 'baremetal-pool', 'resultdb-json-format'],
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-pool',
'resultdb-json-format'
],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@ -202,9 +208,9 @@
'iOS64 Release': {},
'iOS64 Sim Debug (iOS 12)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -212,9 +218,9 @@
},
'iOS64 Sim Debug (iOS 13)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -222,9 +228,9 @@
},
'iOS64 Sim Debug (iOS 14)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -420,9 +426,9 @@
'ios_compile_arm64_rel': {},
'ios_sim_x64_dbg_ios12': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -430,9 +436,9 @@
},
'ios_sim_x64_dbg_ios13': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -440,9 +446,9 @@
},
'ios_sim_x64_dbg_ios14': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
'mac11_or_mac12', 'chromium-tester-service-account',
'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@ -533,8 +539,10 @@
},
},
'mac_asan': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
'os_type':
'mac',
'mixins':
['mac11_or_mac12', 'x86-64', 'resultdb-json-format', 'cores-12'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@ -542,8 +550,10 @@
'mac_compile_dbg': {},
'mac_compile_rel': {},
'mac_dbg': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
'os_type':
'mac',
'mixins':
['mac11_or_mac12', 'x86-64', 'resultdb-json-format', 'cores-12'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@ -551,15 +561,17 @@
'mac_dbg_m1': {
'os_type':
'mac',
'mixins':
['mac11', 'mac-m1-cpu', 'baremetal-try-pool', 'resultdb-json-format'],
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-try-pool',
'resultdb-json-format'
],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
},
'mac_rel': {
'os_type': 'mac',
'mixins': ['mac11', 'x86-64', 'resultdb-json-format'],
'mixins': ['mac11_or_mac12', 'x86-64', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'mac_tests_tryserver',
},
@ -567,8 +579,10 @@
'mac_rel_m1': {
'os_type':
'mac',
'mixins':
['mac11', 'mac-m1-cpu', 'baremetal-try-pool', 'resultdb-json-format'],
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-try-pool',
'resultdb-json-format'
],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},