From 5414cce0a17e1357f02f205fdcd271256e2e072f Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 18 Aug 2022 15:05:21 +0200 Subject: [PATCH] Migrate iOS and Mac tests from mac-11 to mac-12 machines Also remove unused mixins. Bug: b/233192409 Change-Id: I959916b98cebd417088fb7804dc1f44f64134555 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272241 Reviewed-by: Christoffer Jansson Reviewed-by: Jeremy Leconte Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#37826} --- infra/specs/client.webrtc.json | 355 +++++++++++++++---------- infra/specs/client.webrtc.perf.json | 4 +- infra/specs/mixins.pyl | 38 +-- infra/specs/mixins_webrtc.pyl | 67 ++--- infra/specs/test_suites.pyl | 70 +---- infra/specs/tryserver.webrtc.json | 397 ++++++++++++++++------------ infra/specs/waterfalls.pyl | 66 ++--- 7 files changed, 518 insertions(+), 479 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 9b5c568aa0..69440016de 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -6552,7 +6552,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Ubuntu", + "os": "Ubuntu-18.04", "pool": "WebRTC-baremetal" } ] @@ -6645,7 +6645,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6667,7 +6667,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6689,7 +6689,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6711,7 +6711,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6736,7 +6736,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6758,7 +6758,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -6781,7 +6781,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -6804,7 +6804,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -6827,7 +6827,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6849,7 +6849,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6871,7 +6871,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6893,7 +6893,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -6916,7 +6916,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6938,7 +6938,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6960,7 +6960,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -6982,7 +6982,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7004,7 +7004,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7026,7 +7026,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -7049,7 +7049,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7071,7 +7071,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7098,7 +7098,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7120,7 +7120,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7142,7 +7142,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7164,7 +7164,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7189,7 +7189,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7211,7 +7211,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -7234,7 +7234,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -7257,7 +7257,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -7280,7 +7280,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7302,7 +7302,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7324,7 +7324,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7346,7 +7346,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -7369,7 +7369,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7391,7 +7391,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7413,7 +7413,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7435,7 +7435,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7457,7 +7457,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7479,7 +7479,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -7502,7 +7502,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7524,7 +7524,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7549,7 +7549,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7570,7 +7570,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7591,7 +7591,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7612,7 +7612,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7636,7 +7636,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7657,7 +7657,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -7679,7 +7679,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -7701,7 +7701,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -7723,7 +7723,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7744,7 +7744,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7765,7 +7765,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7786,7 +7786,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -7808,7 +7808,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7829,7 +7829,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7850,7 +7850,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7871,7 +7871,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7892,7 +7892,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7913,7 +7913,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac", + "os": "Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7935,7 +7935,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -7957,7 +7957,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -7978,7 +7978,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8003,7 +8003,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8024,7 +8024,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8045,7 +8045,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8066,7 +8066,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8090,7 +8090,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8111,7 +8111,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -8133,7 +8133,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -8155,7 +8155,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -8177,7 +8177,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8198,7 +8198,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8219,7 +8219,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8240,7 +8240,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -8262,7 +8262,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8283,7 +8283,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8304,7 +8304,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8325,7 +8325,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8346,7 +8346,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8367,7 +8367,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -8389,7 +8389,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8410,7 +8410,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -8828,7 +8828,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows", + "os": "Windows-10-19042", "pool": "WebRTC-baremetal" } ] @@ -9372,7 +9372,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9417,7 +9418,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9462,7 +9464,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9507,7 +9510,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9552,7 +9556,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9597,7 +9602,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9643,7 +9649,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9689,7 +9696,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9734,7 +9742,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9779,7 +9788,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9824,7 +9834,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9871,7 +9882,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9917,7 +9929,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9962,7 +9975,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10007,7 +10021,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10052,7 +10067,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10097,7 +10113,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10142,7 +10159,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10187,7 +10205,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10233,7 +10252,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10278,7 +10298,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10328,7 +10349,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10373,7 +10395,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10418,7 +10441,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10463,7 +10487,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10508,7 +10533,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10553,7 +10579,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10599,7 +10626,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10645,7 +10673,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10690,7 +10719,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10735,7 +10765,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10780,7 +10811,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10827,7 +10859,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10873,7 +10906,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10918,7 +10952,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10963,7 +10998,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11008,7 +11044,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11053,7 +11090,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11098,7 +11136,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11143,7 +11182,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11189,7 +11229,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11234,7 +11275,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11284,7 +11326,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11329,7 +11372,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11374,7 +11418,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11419,7 +11464,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11464,7 +11510,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11509,7 +11556,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11555,7 +11603,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11601,7 +11650,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11646,7 +11696,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11691,7 +11742,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11736,7 +11788,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11783,7 +11836,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11829,7 +11883,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11874,7 +11929,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11919,7 +11975,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11964,7 +12021,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -12009,7 +12067,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -12054,7 +12113,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -12099,7 +12159,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -12145,7 +12206,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -12190,7 +12252,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index b121afc2e0..a07c92bd79 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -509,7 +509,7 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "os": "Windows", + "os": "Windows-10-19042", "pool": "WebRTC-perf" } ], @@ -543,7 +543,7 @@ "can_use_on_swarming_builders": true, "dimension_sets": [ { - "os": "Windows", + "os": "Windows-10-19042", "pool": "WebRTC-perf" } ], diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 4ba0430725..0c8ab4f7ad 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -124,13 +124,6 @@ } } }, - 'linux': { - 'swarming': { - 'dimensions': { - 'os': 'Ubuntu' - } - } - }, 'linux-bionic': { 'swarming': { 'dimensions': { @@ -150,13 +143,6 @@ }] } }, - 'mac': { - 'swarming': { - 'dimensions': { - 'os': 'Mac' - } - } - }, 'mac-m1-cpu': { 'swarming': { 'dimensions': { @@ -171,14 +157,7 @@ } } }, - 'mac11_or_mac12': { - 'swarming': { - 'dimensions': { - 'os': 'Mac-11|Mac-12' - } - } - }, - 'mac_12_beta_arm64': { + 'mac_12_arm64': { 'swarming': { 'dimensions': { 'cpu': 'arm64', @@ -186,6 +165,14 @@ } } }, + 'mac_12_x64': { + 'swarming': { + 'dimensions': { + 'cpu': 'x86-64', + 'os': 'Mac-12' + } + } + }, 'mac_toolchain': { 'swarming': { 'cipd_packages': [{ @@ -315,13 +302,6 @@ 'args': ['--xctest', '--undefok=enable-run-ios-unittests-with-xctest'] } }, - 'win': { - 'swarming': { - 'dimensions': { - 'os': 'Windows' - } - } - }, 'win10': { 'swarming': { 'dimensions': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 833cbcf3fa..d3d10d2e3e 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -107,21 +107,6 @@ }, } }, - 'quick-perf-tests': { - '$mixin_append': { - 'args': [ - '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', - '--nologs', - ], - } - }, - 'linux': { - 'swarming': { - 'dimensions': { - 'os': 'Ubuntu' - } - } - }, 'logdog-butler': { 'swarming': { 'cipd_packages': [ @@ -133,13 +118,6 @@ ], }, }, - 'mac': { - 'swarming': { - 'dimensions': { - 'os': 'Mac', - } - } - }, 'mac-m1-cpu': { 'swarming': { 'dimensions': { @@ -154,13 +132,6 @@ } } }, - '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', @@ -194,6 +165,14 @@ 'args': ['--nologs'] } }, + 'quick-perf-tests': { + '$mixin_append': { + 'args': [ + '--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', + '--nologs', + ], + } + }, 'resultdb-gtest-json-format': { '$mixin_append': { 'args': [ @@ -210,6 +189,14 @@ 'result_format': 'json' } }, + 'shamu': { + 'swarming': { + 'dimensions': { + 'device_type': 'shamu', + 'os': 'Android', + }, + }, + }, 'shards-2': { 'swarming': { 'shards': 2, @@ -225,14 +212,6 @@ 'shards': 6, }, }, - 'shamu': { - 'swarming': { - 'dimensions': { - 'device_type': 'shamu', - 'os': 'Android', - }, - }, - }, 'timeout-2h': { 'swarming': { 'hard_timeout': 7200, @@ -253,11 +232,15 @@ ], }, }, - 'win': { + 'xcode_13_main': { + '$mixin_append': { + 'args': ['--xcode-build-version', '13c100'] + }, 'swarming': { - 'dimensions': { - 'os': 'Windows' - } + 'named_caches': [{ + 'name': 'xcode_ios_13c100', + 'path': 'Xcode.app' + }] } - } + }, } diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 00a699bb31..7fdb93723b 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -177,30 +177,6 @@ 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, }, - 'linux_video_capture_tests': { - 'video_capture_tests': { - 'remove_mixins': ['linux-bionic'], - 'mixins': ['linux', 'baremetal-pool'], - } - }, - 'linux_video_capture_tests_tryserver': { - 'video_capture_tests': { - 'remove_mixins': ['linux-bionic'], - 'mixins': ['linux', 'baremetal-try-pool'], - } - }, - 'mac_video_capture_tests': { - 'video_capture_tests': { - 'remove_mixins': ['mac11'], - 'mixins': ['mac', 'baremetal-pool'], - } - }, - 'mac_video_capture_tests_tryserver': { - 'video_capture_tests': { - 'remove_mixins': ['mac11'], - 'mixins': ['mac', 'baremetal-try-pool'], - } - }, 'more_configs_tests': { 'peerconnection_unittests': { 'swarming': { @@ -208,6 +184,16 @@ }, }, }, + 'video_capture_tests': { + 'video_capture_tests': { + 'mixins': ['baremetal-pool'], + } + }, + 'video_capture_tests_tryserver': { + 'video_capture_tests': { + 'mixins': ['baremetal-try-pool'], + } + }, 'webrtc_perf_tests': { 'webrtc_perf_tests': { 'mixins': ['perf-webrtc-perf-tests'], @@ -218,48 +204,20 @@ 'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'], } }, - 'win_video_capture_tests': { - 'video_capture_tests': { - 'mixins': ['win', 'baremetal-pool'], - } - }, - 'win_video_capture_tests_tryserver': { - 'video_capture_tests': { - 'mixins': ['win', 'baremetal-try-pool'], - } - }, }, 'compound_suites': { 'android_tests_tryserver': [ 'android_tests', 'android_webrtc_perf_tests_tryserver', ], - 'linux_tests': [ + 'desktop_tests_tryserver': [ 'desktop_tests', - 'linux_video_capture_tests', - ], - 'linux_tests_tryserver': [ - 'desktop_tests', - 'linux_video_capture_tests_tryserver', + 'video_capture_tests_tryserver', 'webrtc_perf_tests_tryserver', ], - 'mac_tests': [ + 'desktop_tests_with_video_capture': [ 'desktop_tests', - 'mac_video_capture_tests', - ], - 'mac_tests_tryserver': [ - 'desktop_tests', - 'mac_video_capture_tests_tryserver', - 'webrtc_perf_tests_tryserver', - ], - 'win_tests': [ - 'desktop_tests', - 'win_video_capture_tests', - ], - 'win_tests_tryserver': [ - 'desktop_tests', - 'win_video_capture_tests_tryserver', - 'webrtc_perf_tests_tryserver', + 'video_capture_tests', ], }, } diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index b035be44d3..775515a578 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -2861,7 +2861,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2906,7 +2907,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2951,7 +2953,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2996,7 +2999,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3041,7 +3045,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3086,7 +3091,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3132,7 +3138,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3178,7 +3185,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3223,7 +3231,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3268,7 +3277,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3313,7 +3323,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3360,7 +3371,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3406,7 +3418,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3451,7 +3464,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3496,7 +3510,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3541,7 +3556,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3586,7 +3602,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3631,7 +3648,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3676,7 +3694,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3722,7 +3741,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3767,7 +3787,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3817,7 +3838,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3862,7 +3884,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3907,7 +3930,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3952,7 +3976,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3997,7 +4022,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4042,7 +4068,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4088,7 +4115,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4134,7 +4162,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4179,7 +4208,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4224,7 +4254,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4269,7 +4300,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4316,7 +4348,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4362,7 +4395,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4407,7 +4441,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4452,7 +4487,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4497,7 +4533,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4542,7 +4579,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4587,7 +4625,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4632,7 +4671,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4678,7 +4718,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4723,7 +4764,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4773,7 +4815,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4818,7 +4861,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4863,7 +4907,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4908,7 +4953,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4953,7 +4999,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4998,7 +5045,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5044,7 +5092,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5090,7 +5139,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5135,7 +5185,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5180,7 +5231,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5225,7 +5277,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5272,7 +5325,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5318,7 +5372,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5363,7 +5418,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5408,7 +5464,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5453,7 +5510,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5498,7 +5556,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5543,7 +5602,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5588,7 +5648,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5634,7 +5695,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5679,7 +5741,8 @@ ], "dimension_sets": [ { - "os": "Mac-11|Mac-12" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -7836,7 +7899,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Ubuntu", + "os": "Ubuntu-18.04", "pool": "WebRTC-baremetal-try" } ] @@ -10114,7 +10177,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10136,7 +10199,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10158,7 +10221,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10180,7 +10243,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10205,7 +10268,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10227,7 +10290,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -10250,7 +10313,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -10273,7 +10336,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -10296,7 +10359,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10318,7 +10381,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10340,7 +10403,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10362,7 +10425,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -10385,7 +10448,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10407,7 +10470,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10429,7 +10492,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10451,7 +10514,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10473,7 +10536,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10495,7 +10558,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -10518,7 +10581,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10540,7 +10603,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10568,7 +10631,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10590,7 +10653,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10612,7 +10675,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10634,7 +10697,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10659,7 +10722,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10681,7 +10744,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -10704,7 +10767,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -10727,7 +10790,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -10750,7 +10813,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10772,7 +10835,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10794,7 +10857,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10816,7 +10879,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -10839,7 +10902,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10861,7 +10924,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10883,7 +10946,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10905,7 +10968,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10927,7 +10990,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10949,7 +11012,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -10972,7 +11035,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -10994,7 +11057,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11019,7 +11082,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11040,7 +11103,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11061,7 +11124,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11082,7 +11145,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11106,7 +11169,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11127,7 +11190,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -11149,7 +11212,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -11171,7 +11234,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -11193,7 +11256,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11214,7 +11277,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11235,7 +11298,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11256,7 +11319,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -11278,7 +11341,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11299,7 +11362,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11320,7 +11383,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11341,7 +11404,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11362,7 +11425,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11383,7 +11446,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -11405,7 +11468,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11426,7 +11489,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11451,7 +11514,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11472,7 +11535,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11493,7 +11556,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11514,7 +11577,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11538,7 +11601,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11559,7 +11622,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -11581,7 +11644,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -11603,7 +11666,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -11625,7 +11688,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11646,7 +11709,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11667,7 +11730,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11688,7 +11751,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -11710,7 +11773,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11731,7 +11794,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11752,7 +11815,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11773,7 +11836,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11794,7 +11857,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11815,7 +11878,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac", + "os": "Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11837,7 +11900,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -11859,7 +11922,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11880,7 +11943,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11907,7 +11970,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11932,7 +11995,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11953,7 +12016,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11974,7 +12037,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -11995,7 +12058,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12019,7 +12082,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12040,7 +12103,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 2 @@ -12062,7 +12125,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -12084,7 +12147,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -12106,7 +12169,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12127,7 +12190,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12148,7 +12211,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12169,7 +12232,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 6 @@ -12191,7 +12254,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12212,7 +12275,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12233,7 +12296,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12254,7 +12317,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12275,7 +12338,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12296,7 +12359,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ], "shards": 4 @@ -12318,7 +12381,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -12339,7 +12402,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11|Mac-12" + "os": "Mac-12" } ] }, @@ -14892,7 +14955,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows", + "os": "Windows-10-19042", "pool": "WebRTC-baremetal-try" } ] diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 73c8e9a887..974662a741 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -136,41 +136,37 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + 'isolated_scripts': 'desktop_tests_with_video_capture', }, }, 'Linux64 Release (ARM)': {}, 'Linux64 Release (Libfuzzer)': {}, 'Mac Asan': { - 'os_type': - 'mac', - 'mixins': - ['mac11_or_mac12', 'x86-64', 'cores-12', 'resultdb-json-format'], + 'os_type': 'mac', + 'mixins': ['mac_12_x64', 'cores-12', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Mac64 Builder': {}, 'Mac64 Debug': { - 'os_type': - 'mac', - 'mixins': - ['mac11_or_mac12', 'x86-64', 'cores-12', 'resultdb-json-format'], + 'os_type': 'mac', + 'mixins': ['mac_12_x64', 'cores-12', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Mac64 Release': { 'os_type': 'mac', - 'mixins': ['mac11_or_mac12', 'x86-64', 'resultdb-json-format'], + 'mixins': ['mac_12_x64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'mac_tests', + 'isolated_scripts': 'desktop_tests_with_video_capture', }, }, 'MacARM64 M1 Release': { 'os_type': 'mac', - 'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'], - # TODO(b/228171565): Replace desktop_tests by mac_tests when + 'mixins': ['mac_12_arm64', 'mac-m1-cpu', 'resultdb-json-format'], + # TODO(b/228171565): Replace desktop_tests by desktop_tests_with_video_capture when # there is a camera available for the baremetal m1 machines. 'test_suites': { 'isolated_scripts': 'desktop_tests', @@ -190,7 +186,7 @@ 'os_type': 'win', 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'win_tests', + 'isolated_scripts': 'desktop_tests_with_video_capture', }, }, 'Win64 ASan': { @@ -206,7 +202,7 @@ 'iOS64 Release': {}, 'iOS64 Sim Debug (iOS 12)': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -216,7 +212,7 @@ }, 'iOS64 Sim Debug (iOS 13)': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -226,7 +222,7 @@ }, 'iOS64 Sim Debug (iOS 14)': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -302,7 +298,7 @@ 'os_type': 'mac', 'mixins': [ - 'mac_12_beta_arm64', 'mac-m1-cpu', 'perf-pool', 'timeout-3h', + 'mac_12_arm64', 'mac-m1-cpu', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format' ], 'test_suites': { @@ -313,7 +309,7 @@ 'os_type': 'win', 'mixins': - ['win', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'], + ['win10', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_perf_tests', }, @@ -424,7 +420,7 @@ 'ios_compile_arm64_rel': {}, 'ios_sim_x64_dbg_ios12': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -434,7 +430,7 @@ }, 'ios_sim_x64_dbg_ios13': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -444,7 +440,7 @@ }, 'ios_sim_x64_dbg_ios14': { 'mixins': [ - 'mac11_or_mac12', 'chromium-tester-service-account', + 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg' ], @@ -498,7 +494,7 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests_tryserver', + 'isolated_scripts': 'desktop_tests_tryserver', }, }, 'linux_tsan2': { @@ -537,10 +533,8 @@ }, }, 'mac_asan': { - 'os_type': - 'mac', - 'mixins': - ['mac11_or_mac12', 'x86-64', 'resultdb-json-format', 'cores-12'], + 'os_type': 'mac', + 'mixins': ['mac_12_x64', 'resultdb-json-format', 'cores-12'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -548,32 +542,30 @@ 'mac_compile_dbg': {}, 'mac_compile_rel': {}, 'mac_dbg': { - 'os_type': - 'mac', - 'mixins': - ['mac11_or_mac12', 'x86-64', 'resultdb-json-format', 'cores-12'], + 'os_type': 'mac', + 'mixins': ['mac_12_x64', 'resultdb-json-format', 'cores-12'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'mac_dbg_m1': { 'os_type': 'mac', - 'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'], + 'mixins': ['mac_12_arm64', 'mac-m1-cpu', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'mac_rel': { 'os_type': 'mac', - 'mixins': ['mac11_or_mac12', 'x86-64', 'resultdb-json-format'], + 'mixins': ['mac_12_x64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'mac_tests_tryserver', + 'isolated_scripts': 'desktop_tests_tryserver', }, }, 'mac_rel_m1': { 'os_type': 'mac', - 'mixins': ['mac11_or_mac12', 'mac-m1-cpu', 'resultdb-json-format'], - # TODO(b/228171565): Replace desktop_tests by mac_tests_tryserver when + 'mixins': ['mac_12_arm64', 'mac-m1-cpu', 'resultdb-json-format'], + # TODO(b/228171565): Replace desktop_tests by desktop_tests_tryserver when # there is a camera available for the baremetal-try m1 machines. 'test_suites': { 'isolated_scripts': 'desktop_tests', @@ -622,7 +614,7 @@ 'os_type': 'win', 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'win_tests_tryserver', + 'isolated_scripts': 'desktop_tests_tryserver', }, }, 'win_x86_more_configs': {