diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index ff24b95afe..5df7faa1f7 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -8515,7 +8515,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8564,7 +8565,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8613,7 +8615,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8662,7 +8665,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8711,7 +8715,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8760,7 +8765,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8809,7 +8815,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8858,7 +8865,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8907,7 +8915,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -8956,7 +8965,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9005,7 +9015,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9055,7 +9066,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9105,7 +9117,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9154,7 +9167,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9203,7 +9217,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9252,7 +9267,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9301,7 +9317,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9350,7 +9367,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9399,7 +9417,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9448,7 +9467,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9502,7 +9522,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9551,7 +9572,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9600,7 +9622,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9649,7 +9672,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9698,7 +9722,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9747,7 +9772,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9796,7 +9822,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9845,7 +9872,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9894,7 +9922,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9943,7 +9972,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -9992,7 +10022,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10042,7 +10073,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10092,7 +10124,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10141,7 +10174,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10190,7 +10224,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10239,7 +10274,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10288,7 +10324,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10337,7 +10374,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10386,7 +10424,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10435,7 +10474,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10489,7 +10529,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10538,7 +10579,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10587,7 +10629,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10636,7 +10679,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10685,7 +10729,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10734,7 +10779,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10783,7 +10829,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10832,7 +10879,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10881,7 +10929,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10930,7 +10979,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -10979,7 +11029,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11029,7 +11080,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11079,7 +11131,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11128,7 +11181,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11177,7 +11231,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11226,7 +11281,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11275,7 +11331,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11324,7 +11381,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11373,7 +11431,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -11422,7 +11481,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index df8ce7b3d3..3c4b69b944 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -172,6 +172,14 @@ } } }, + '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 3f6acfae7b..bbafb18299 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -2621,7 +2621,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2670,7 +2671,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2719,7 +2721,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2768,7 +2771,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2817,7 +2821,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2866,7 +2871,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2915,7 +2921,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -2964,7 +2971,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3013,7 +3021,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3062,7 +3071,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3111,7 +3121,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3161,7 +3172,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3211,7 +3223,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3260,7 +3273,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3309,7 +3323,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3358,7 +3373,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3407,7 +3423,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3456,7 +3473,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3505,7 +3523,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3554,7 +3573,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3608,7 +3628,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3657,7 +3678,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3706,7 +3728,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3755,7 +3778,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3804,7 +3828,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3853,7 +3878,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3902,7 +3928,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -3951,7 +3978,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4000,7 +4028,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4049,7 +4078,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4098,7 +4128,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4148,7 +4179,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4198,7 +4230,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4247,7 +4280,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4296,7 +4330,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4345,7 +4380,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4394,7 +4430,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4443,7 +4480,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4492,7 +4530,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4541,7 +4580,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4595,7 +4635,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4644,7 +4685,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4693,7 +4735,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4742,7 +4785,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4791,7 +4835,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4840,7 +4885,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4889,7 +4935,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4938,7 +4985,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -4987,7 +5035,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5036,7 +5085,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5085,7 +5135,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5135,7 +5186,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5185,7 +5237,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5234,7 +5287,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5283,7 +5337,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5332,7 +5387,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5381,7 +5437,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5430,7 +5487,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5479,7 +5537,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ @@ -5528,7 +5587,8 @@ ], "dimension_sets": [ { - "os": "Mac-11" + "cpu": "x86-64", + "os": "Mac-12" } ], "named_caches": [ diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 5c8e4351bf..401d8dff84 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -199,9 +199,9 @@ 'iOS64 Release': {}, 'iOS64 Sim Debug (iOS 12)': { 'mixins': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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', @@ -429,9 +429,9 @@ 'ios_compile_arm64_rel': {}, 'ios_sim_x64_dbg_ios12': { 'mixins': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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', @@ -439,9 +439,9 @@ }, 'ios_sim_x64_dbg_ios13': { 'mixins': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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', @@ -449,9 +449,9 @@ }, 'ios_sim_x64_dbg_ios14': { 'mixins': [ - 'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0', - 'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration', - 'out_dir_arg' + 'mac_12_x64', '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',