Revert "Migrate iOS simulator tests to Mac-12 machines."
This reverts commit 3466511ee1bb29f34851e497d7734f47cd078918.
Reason for revert: Pending time can be very long when the test are running at the same time as this builder:
https://luci-milo.appspot.com/p/chromium/builders/ci/ios15-beta-simulator
Original change's description:
> Migrate iOS simulator tests to Mac-12 machines.
>
> Bug: b/227442116
> Change-Id: I7b5157a735596616f9785391c40b8f26974c222d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260985
> Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
> Commit-Queue: Jeremy Leconte <jleconte@google.com>
> Cr-Commit-Position: refs/heads/main@{#36751}
Bug: b/227442116
Change-Id: I87f27b36db7aa4c6d9d6982a5e86d56648a709e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261307
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36795}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 627e2a0..574b9cb 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -8953,8 +8953,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9003,8 +9002,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9053,8 +9051,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9103,8 +9100,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9153,8 +9149,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9203,8 +9198,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9253,8 +9247,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9303,8 +9296,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9353,8 +9345,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9403,8 +9394,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9453,8 +9443,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9504,8 +9493,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9555,8 +9543,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9605,8 +9592,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9655,8 +9641,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9705,8 +9690,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9755,8 +9739,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9805,8 +9788,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9855,8 +9837,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9905,8 +9886,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -9960,8 +9940,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10010,8 +9989,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10060,8 +10038,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10110,8 +10087,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10160,8 +10136,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10210,8 +10185,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10260,8 +10234,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10310,8 +10283,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10360,8 +10332,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10410,8 +10381,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10460,8 +10430,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10511,8 +10480,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10562,8 +10530,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10612,8 +10579,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10662,8 +10628,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10712,8 +10677,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10762,8 +10726,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10812,8 +10775,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10862,8 +10824,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10912,8 +10873,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -10967,8 +10927,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11017,8 +10976,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11067,8 +11025,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11117,8 +11074,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11167,8 +11123,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11217,8 +11172,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11267,8 +11221,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11317,8 +11270,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11367,8 +11319,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11417,8 +11368,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11467,8 +11417,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11518,8 +11467,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11569,8 +11517,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11619,8 +11566,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11669,8 +11615,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11719,8 +11664,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11769,8 +11713,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11819,8 +11762,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11869,8 +11811,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -11919,8 +11860,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 3c4b69b..df8ce7b 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -172,14 +172,6 @@
}
}
},
- 'mac_12_x64': {
- 'swarming': {
- 'dimensions': {
- 'cpu': 'x86-64',
- 'os': 'Mac-12'
- }
- }
- },
'mac_toolchain': {
'swarming': {
'cipd_packages': [{
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 0d5500c..7add802 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2741,8 +2741,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -2791,8 +2790,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -2841,8 +2839,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -2891,8 +2888,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -2941,8 +2937,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -2991,8 +2986,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3041,8 +3035,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3091,8 +3084,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3141,8 +3133,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3191,8 +3182,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3241,8 +3231,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3292,8 +3281,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3343,8 +3331,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3393,8 +3380,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3443,8 +3429,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3493,8 +3478,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3543,8 +3527,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3593,8 +3576,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3643,8 +3625,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3693,8 +3674,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3748,8 +3728,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3798,8 +3777,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3848,8 +3826,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3898,8 +3875,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3948,8 +3924,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -3998,8 +3973,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4048,8 +4022,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4098,8 +4071,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4148,8 +4120,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4198,8 +4169,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4248,8 +4218,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4299,8 +4268,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4350,8 +4318,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4400,8 +4367,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4450,8 +4416,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4500,8 +4465,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4550,8 +4514,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4600,8 +4563,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4650,8 +4612,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4700,8 +4661,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4755,8 +4715,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4805,8 +4764,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4855,8 +4813,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4905,8 +4862,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -4955,8 +4911,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5005,8 +4960,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5055,8 +5009,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5105,8 +5058,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5155,8 +5107,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5205,8 +5156,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5255,8 +5205,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5306,8 +5255,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5357,8 +5305,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5407,8 +5354,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5457,8 +5403,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5507,8 +5452,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5557,8 +5501,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5607,8 +5550,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5657,8 +5599,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
@@ -5707,8 +5648,7 @@
],
"dimension_sets": [
{
- "cpu": "x86-64",
- "os": "Mac-12"
+ "os": "Mac-11"
}
],
"named_caches": [
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 7aceb13..ec49cf9 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -199,9 +199,9 @@
'iOS64 Release': {},
'iOS64 Sim Debug (iOS 12)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-12.4', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -209,9 +209,9 @@
},
'iOS64 Sim Debug (iOS 13)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-13.6', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -219,9 +219,9 @@
},
'iOS64 Sim Debug (iOS 14.0)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-14.0', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -403,9 +403,9 @@
'ios_compile_arm64_rel': {},
'ios_sim_x64_dbg_ios12': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-12.4', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -413,9 +413,9 @@
},
'ios_sim_x64_dbg_ios13': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-13.6', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -423,9 +423,9 @@
},
'ios_sim_x64_dbg_ios14': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-14.0', 'xcode_12a7209', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
+ 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
