diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 9ddec29ab8..e11f4eb782 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -6336,7 +6336,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6358,7 +6358,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6380,7 +6380,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6402,7 +6402,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6427,7 +6427,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6449,7 +6449,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -6472,7 +6472,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -6495,7 +6495,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -6518,7 +6518,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6540,7 +6540,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6562,7 +6562,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6584,7 +6584,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -6607,7 +6607,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6629,7 +6629,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6651,7 +6651,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6673,7 +6673,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6695,7 +6695,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -6718,7 +6718,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6740,7 +6740,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6767,7 +6767,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6789,7 +6789,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6811,7 +6811,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6833,7 +6833,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6858,7 +6858,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6880,7 +6880,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -6903,7 +6903,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -6926,7 +6926,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -6949,7 +6949,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6971,7 +6971,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -6993,7 +6993,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7015,7 +7015,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -7038,7 +7038,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7060,7 +7060,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7082,7 +7082,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7104,7 +7104,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7126,7 +7126,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -7149,7 +7149,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7171,7 +7171,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7196,7 +7196,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7217,7 +7217,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7238,7 +7238,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7259,7 +7259,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7283,7 +7283,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7304,7 +7304,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -7326,7 +7326,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -7348,7 +7348,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -7370,7 +7370,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7391,7 +7391,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7412,7 +7412,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7433,7 +7433,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -7455,7 +7455,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7476,7 +7476,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7497,7 +7497,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7518,7 +7518,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7561,7 +7561,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -7583,7 +7583,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7604,7 +7604,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -7629,7 +7629,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7651,7 +7651,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7673,7 +7673,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7695,7 +7695,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7720,7 +7720,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7742,7 +7742,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ], @@ -7765,7 +7765,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ], @@ -7788,7 +7788,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ], @@ -7811,7 +7811,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7833,7 +7833,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7855,7 +7855,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7877,7 +7877,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ], @@ -7900,7 +7900,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7922,7 +7922,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7944,7 +7944,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7966,7 +7966,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -7988,7 +7988,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ], @@ -8011,7 +8011,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -8033,7 +8033,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal" } ] @@ -8954,7 +8954,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -8999,7 +8999,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9044,7 +9044,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9089,7 +9089,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9134,7 +9134,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9179,7 +9179,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9225,7 +9225,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9271,7 +9271,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9316,7 +9316,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9361,7 +9361,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9406,7 +9406,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9453,7 +9453,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9499,7 +9499,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9544,7 +9544,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9589,7 +9589,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9634,7 +9634,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9679,7 +9679,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9724,7 +9724,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9770,7 +9770,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9815,7 +9815,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9865,7 +9865,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9910,7 +9910,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9955,7 +9955,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10000,7 +10000,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10045,7 +10045,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10090,7 +10090,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10136,7 +10136,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10182,7 +10182,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10227,7 +10227,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10272,7 +10272,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10317,7 +10317,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10364,7 +10364,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10410,7 +10410,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10455,7 +10455,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10500,7 +10500,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10545,7 +10545,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10590,7 +10590,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10635,7 +10635,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10681,7 +10681,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10726,7 +10726,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10776,7 +10776,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10821,7 +10821,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10866,7 +10866,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10911,7 +10911,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -10956,7 +10956,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11001,7 +11001,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11047,7 +11047,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11093,7 +11093,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11138,7 +11138,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11183,7 +11183,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11228,7 +11228,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11275,7 +11275,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11321,7 +11321,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11366,7 +11366,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11411,7 +11411,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11456,7 +11456,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11501,7 +11501,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11546,7 +11546,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11592,7 +11592,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -11637,7 +11637,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index a8d779633b..2201698ea7 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -171,6 +171,13 @@ } } }, + 'mac11_or_mac12': { + 'swarming': { + 'dimensions': { + 'os': 'Mac-11|Mac-12' + } + } + }, 'mac_12_beta_arm64': { 'swarming': { 'dimensions': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index ae287261d8..e972b5f722 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -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', diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 55932831d9..bf0e034a31 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -2741,7 +2741,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -2786,7 +2786,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -2831,7 +2831,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -2876,7 +2876,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -2921,7 +2921,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -2966,7 +2966,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3012,7 +3012,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3058,7 +3058,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3103,7 +3103,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3148,7 +3148,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3193,7 +3193,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3240,7 +3240,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3286,7 +3286,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3331,7 +3331,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3376,7 +3376,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3421,7 +3421,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3466,7 +3466,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3511,7 +3511,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3557,7 +3557,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3602,7 +3602,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3652,7 +3652,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3697,7 +3697,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3742,7 +3742,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3787,7 +3787,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3832,7 +3832,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3877,7 +3877,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3923,7 +3923,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -3969,7 +3969,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4014,7 +4014,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4059,7 +4059,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4104,7 +4104,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4151,7 +4151,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4197,7 +4197,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4242,7 +4242,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4287,7 +4287,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4332,7 +4332,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4377,7 +4377,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4422,7 +4422,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4468,7 +4468,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4513,7 +4513,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4563,7 +4563,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4608,7 +4608,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4653,7 +4653,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4698,7 +4698,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4743,7 +4743,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4788,7 +4788,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4834,7 +4834,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4880,7 +4880,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4925,7 +4925,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -4970,7 +4970,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5015,7 +5015,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5062,7 +5062,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5108,7 +5108,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5153,7 +5153,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5198,7 +5198,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5243,7 +5243,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5288,7 +5288,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5333,7 +5333,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5379,7 +5379,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -5424,7 +5424,7 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "named_caches": [ @@ -9649,7 +9649,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9671,7 +9671,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9693,7 +9693,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9715,7 +9715,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9740,7 +9740,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9762,7 +9762,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -9785,7 +9785,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -9808,7 +9808,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -9831,7 +9831,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9853,7 +9853,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9875,7 +9875,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9897,7 +9897,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -9920,7 +9920,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9942,7 +9942,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9964,7 +9964,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -9986,7 +9986,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10008,7 +10008,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -10031,7 +10031,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10053,7 +10053,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10081,7 +10081,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10103,7 +10103,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10125,7 +10125,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10147,7 +10147,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10172,7 +10172,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10194,7 +10194,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -10217,7 +10217,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -10240,7 +10240,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -10263,7 +10263,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10285,7 +10285,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10307,7 +10307,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10329,7 +10329,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -10352,7 +10352,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10374,7 +10374,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10396,7 +10396,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10418,7 +10418,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10440,7 +10440,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -10463,7 +10463,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10485,7 +10485,7 @@ { "cores": "12", "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10510,7 +10510,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10532,7 +10532,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10554,7 +10554,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10576,7 +10576,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10601,7 +10601,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10623,7 +10623,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -10646,7 +10646,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -10669,7 +10669,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -10692,7 +10692,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10714,7 +10714,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10736,7 +10736,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10758,7 +10758,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -10781,7 +10781,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10803,7 +10803,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10825,7 +10825,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10847,7 +10847,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10869,7 +10869,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -10892,7 +10892,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10914,7 +10914,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -10940,7 +10940,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10961,7 +10961,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -10982,7 +10982,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11003,7 +11003,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11027,7 +11027,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11048,7 +11048,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 2 @@ -11070,7 +11070,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -11092,7 +11092,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -11114,7 +11114,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11135,7 +11135,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11156,7 +11156,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11177,7 +11177,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 6 @@ -11199,7 +11199,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11220,7 +11220,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11241,7 +11241,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11262,7 +11262,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11305,7 +11305,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ], "shards": 4 @@ -11327,7 +11327,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11348,7 +11348,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11375,7 +11375,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Mac-11" + "os": "Mac-11|Mac-12" } ] }, @@ -11400,7 +11400,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11422,7 +11422,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11444,7 +11444,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11466,7 +11466,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11491,7 +11491,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11513,7 +11513,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -11536,7 +11536,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -11559,7 +11559,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -11582,7 +11582,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11604,7 +11604,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11626,7 +11626,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11648,7 +11648,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -11671,7 +11671,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11693,7 +11693,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11715,7 +11715,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11737,7 +11737,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11759,7 +11759,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ], @@ -11782,7 +11782,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] @@ -11804,7 +11804,7 @@ "dimension_sets": [ { "cpu": "arm64-64-Apple_M1", - "os": "Mac-11", + "os": "Mac-11|Mac-12", "pool": "WebRTC-baremetal-try" } ] diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 6e3c6a20de..0bf8bc53ba 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -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', },