commit 04c32349af4b3a19ad32f179c480282cf4f554d4
parent 7b3ffb0d1f9137aaa06ef570734b2702aeda2421
Author: Dan Baker <dbaker@mozilla.com>
Date: Fri, 24 Oct 2025 14:07:15 -0600
Bug 1995393 - Vendor libwebrtc from 33f3b4a356
Upstream commit: https://webrtc.googlesource.com/src/+/33f3b4a3561299b0968d2cdaa757389a157fa8ac
Switch M1 bots to use macOS 15.
The machines in the pool chromium.tests have been upgraded. At the
moment there are only 50 machines using macOS 14, causing timeouts.
This CL moves WebRTC Mac M1 tests to macOS 15.
Bug: b/440319983
Change-Id: I05e6f347ce1be7e11acff6f8bc9c476189f6e30a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405560
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45404}
Diffstat:
6 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-24T20:04:55.890062+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-24T20:07:02.954184+00:00.
# base of lastest vendoring
-92fd6cff81
+33f3b4a356
diff --git a/third_party/libwebrtc/infra/specs/client.webrtc.json b/third_party/libwebrtc/infra/specs/client.webrtc.json
@@ -6673,7 +6673,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "audio_decoder_unittests",
@@ -6690,7 +6690,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_audio_unittests",
@@ -6707,7 +6707,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_video_unittests",
@@ -6724,7 +6724,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "dcsctp_unittests",
@@ -6741,7 +6741,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 2
},
@@ -6759,7 +6759,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -6777,7 +6777,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -6795,7 +6795,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_media_unittests",
@@ -6812,7 +6812,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_p2p_unittests",
@@ -6829,7 +6829,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_pc_unittests",
@@ -6846,7 +6846,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_stats_unittests",
@@ -6863,7 +6863,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -6881,7 +6881,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "slow_peer_connection_unittests",
@@ -6898,7 +6898,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -6916,7 +6916,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "system_wrappers_unittests",
@@ -6933,7 +6933,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "test_support_unittests",
@@ -6950,7 +6950,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "tools_unittests",
@@ -6967,7 +6967,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -6985,7 +6985,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "voip_unittests",
@@ -7002,7 +7002,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "webrtc_nonparallel_tests",
diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl
@@ -145,19 +145,19 @@
}
}
},
- 'mac_14_arm64': {
+ 'mac_14_x64': {
'swarming': {
'dimensions': {
- 'cpu': 'arm64',
+ 'cpu': 'x86-64',
'os': 'Mac-14'
}
}
},
- 'mac_14_x64': {
+ 'mac_15_arm64': {
'swarming': {
'dimensions': {
- 'cpu': 'x86-64',
- 'os': 'Mac-14'
+ 'cpu': 'arm64',
+ 'os': 'Mac-15'
}
}
},
diff --git a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl
@@ -119,11 +119,11 @@
}
}
},
- 'mac_14_arm64': {
+ 'mac_15_arm64': {
'swarming': {
'dimensions': {
'cpu': 'arm64',
- 'os': 'Mac-14'
+ 'os': 'Mac-15'
}
}
},
diff --git a/third_party/libwebrtc/infra/specs/tryserver.webrtc.json b/third_party/libwebrtc/infra/specs/tryserver.webrtc.json
@@ -9919,7 +9919,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "audio_decoder_unittests",
@@ -9936,7 +9936,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_audio_unittests",
@@ -9953,7 +9953,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_video_unittests",
@@ -9970,7 +9970,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "dcsctp_unittests",
@@ -9987,7 +9987,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 2
},
@@ -10005,7 +10005,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -10023,7 +10023,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10041,7 +10041,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_media_unittests",
@@ -10058,7 +10058,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_p2p_unittests",
@@ -10075,7 +10075,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_pc_unittests",
@@ -10092,7 +10092,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_stats_unittests",
@@ -10109,7 +10109,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -10127,7 +10127,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "slow_peer_connection_unittests",
@@ -10144,7 +10144,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10162,7 +10162,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "system_wrappers_unittests",
@@ -10179,7 +10179,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "test_support_unittests",
@@ -10196,7 +10196,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "tools_unittests",
@@ -10213,7 +10213,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10231,7 +10231,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "voip_unittests",
@@ -10248,7 +10248,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "webrtc_nonparallel_tests",
@@ -10665,7 +10665,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "audio_decoder_unittests",
@@ -10682,7 +10682,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_audio_unittests",
@@ -10699,7 +10699,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "common_video_unittests",
@@ -10716,7 +10716,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "dcsctp_unittests",
@@ -10733,7 +10733,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 2
},
@@ -10751,7 +10751,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -10769,7 +10769,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10787,7 +10787,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_media_unittests",
@@ -10804,7 +10804,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_p2p_unittests",
@@ -10821,7 +10821,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_pc_unittests",
@@ -10838,7 +10838,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "rtc_stats_unittests",
@@ -10855,7 +10855,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 6
},
@@ -10873,7 +10873,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "slow_peer_connection_unittests",
@@ -10890,7 +10890,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10908,7 +10908,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "system_wrappers_unittests",
@@ -10925,7 +10925,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "test_support_unittests",
@@ -10942,7 +10942,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "tools_unittests",
@@ -10959,7 +10959,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
},
"shards": 4
},
@@ -10977,7 +10977,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "voip_unittests",
@@ -10994,7 +10994,7 @@
"swarming": {
"dimensions": {
"cpu": "arm64-64-Apple_M1",
- "os": "Mac-14"
+ "os": "Mac-15"
}
},
"test": "webrtc_nonparallel_tests",
diff --git a/third_party/libwebrtc/infra/specs/waterfalls.pyl b/third_party/libwebrtc/infra/specs/waterfalls.pyl
@@ -183,7 +183,7 @@
},
'MacARM64 M1 Release': {
'os_type': 'mac',
- 'mixins': ['mac_14_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
+ 'mixins': ['mac_15_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@@ -550,7 +550,7 @@
},
'mac_dbg_m1': {
'os_type': 'mac',
- 'mixins': ['mac_14_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
+ 'mixins': ['mac_15_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
@@ -564,7 +564,7 @@
},
'mac_rel_m1': {
'os_type': 'mac',
- 'mixins': ['mac_14_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
+ 'mixins': ['mac_15_arm64', 'mac-m1-cpu', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests',
},
