zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run Mac M1 try jobs.

Browse Source 
Also use baremetal pool only for the video_capture_tests.
Currently this test is disabled on the M1 machines because they don't have a camera ready.

Change-Id: Ie34b5a09219d7e0e43ff026bcbdfba922955f8bb
Bug: b/230719743
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265680
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37235}
This commit is contained in:
Jeremy Leconte
2022-06-16 13:51:42 +02:00
committed by WebRTC LUCI CQ
parent 091e073b63
commit 413ca2b95d
6 changed files with 87 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
infra/config/commit-queue.cfg
View File

@ -145,9 +145,15 @@ config_groups {
builders {
name: "webrtc/try/mac_compile_dbg"
}
builders {
name: "webrtc/try/mac_dbg_m1"
}
builders {
name: "webrtc/try/mac_rel"
}
builders {
name: "webrtc/try/mac_rel_m1"
}
builders {
name: "webrtc/try/presubmit"
disable_reuse: true
@ -300,9 +306,15 @@ config_groups {
builders {
name: "webrtc/try/mac_compile_dbg"
}
builders {
name: "webrtc/try/mac_dbg_m1"
}
builders {
name: "webrtc/try/mac_rel"
}
builders {
name: "webrtc/try/mac_rel_m1"
}
builders {
name: "webrtc/try/presubmit"
disable_reuse: true

4
infra/config/config.star
View File

@ -763,8 +763,8 @@ mac_builder("Mac Asan", "Mac|x64|asan")
mac_try_job("mac_asan")
mac_try_job("mac_chromium_compile", recipe = "chromium_trybot", branch_cq = False)
mac_builder("MacARM64 M1 Release", "Mac|arm64M1|rel", cpu = "arm64-64-Apple_M1")
mac_try_job("mac_rel_m1", try_cat = None, cq = None)
mac_try_job("mac_dbg_m1", try_cat = None, cq = None)
mac_try_job("mac_rel_m1")
mac_try_job("mac_dbg_m1")
win_builder("Win32 Debug (Clang)", "Win Clang|x86|dbg")
win_try_job("win_x86_clang_dbg", cq = None)

6
infra/config/luci-milo.cfg
View File

@ -564,6 +564,12 @@ consoles {
builders {
name: "buildbucket/luci.webrtc.try/mac_chromium_compile"
}
builders {
name: "buildbucket/luci.webrtc.try/mac_rel_m1"
}
builders {
name: "buildbucket/luci.webrtc.try/mac_dbg_m1"
}
builders {
name: "buildbucket/luci.webrtc.try/win_x86_clang_dbg"
}

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

@ -7629,8 +7629,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7651,8 +7650,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7673,8 +7671,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7695,8 +7692,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7720,8 +7716,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7742,8 +7737,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
],
"shards": 2
@ -7765,8 +7759,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -7788,8 +7781,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -7811,8 +7803,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7833,8 +7824,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7855,8 +7845,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7877,8 +7866,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -7900,8 +7888,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7922,8 +7909,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7944,8 +7930,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7966,8 +7951,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -7988,8 +7972,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -8011,8 +7994,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},
@ -8033,8 +8015,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal"
"os": "Mac-11|Mac-12"
}
]
},

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

@ -10510,8 +10510,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10532,8 +10531,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10554,8 +10552,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10576,8 +10573,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10601,8 +10597,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10623,8 +10618,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 2
@ -10646,8 +10640,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -10669,8 +10662,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -10692,8 +10684,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10714,8 +10705,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10736,8 +10726,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10758,8 +10747,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -10781,8 +10769,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10803,8 +10790,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10825,8 +10811,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10847,8 +10832,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10869,8 +10853,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -10892,8 +10875,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -10914,8 +10896,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11400,8 +11381,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11422,8 +11402,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11444,8 +11423,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11466,8 +11444,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11491,8 +11468,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11513,8 +11489,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 2
@ -11536,8 +11511,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -11559,8 +11533,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -11582,8 +11555,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11604,8 +11576,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11626,8 +11597,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11648,8 +11618,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 6
@ -11671,8 +11640,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11693,8 +11661,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11715,8 +11682,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11737,8 +11703,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11759,8 +11724,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
],
"shards": 4
@ -11782,8 +11746,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},
@ -11804,8 +11767,7 @@
"dimension_sets": [
{
"cpu": "arm64-64-Apple_M1",
"os": "Mac-11|Mac-12",
"pool": "WebRTC-baremetal-try"
"os": "Mac-11|Mac-12"
}
]
},

28
infra/specs/waterfalls.pyl
View File

@ -168,12 +168,10 @@
},
},
'MacARM64 M1 Release': {
'os_type':
'mac',
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-pool',
'resultdb-json-format'
],
'os_type': 'mac',
'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'],
# TODO(b/228171565): Replace desktop_tests by mac_tests when
# there is a camera available for the baremetal m1 machines.
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@ -559,12 +557,8 @@
},
},
'mac_dbg_m1': {
'os_type':
'mac',
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-try-pool',
'resultdb-json-format'
],
'os_type': 'mac',
'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@ -577,12 +571,10 @@
},
},
'mac_rel_m1': {
'os_type':
'mac',
'mixins': [
'mac11_or_mac12', 'mac-m1-cpu', 'baremetal-try-pool',
'resultdb-json-format'
],
'os_type': 'mac',
'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'],
# TODO(b/228171565): Replace desktop_tests by mac_tests_tryserver when
# there is a camera available for the baremetal-try m1 machines.
'test_suites': {
'isolated_scripts': 'desktop_tests',
},