From 3c1756adad63e6cb926755a8e1f9bce6c1c7cf1b Mon Sep 17 00:00:00 2001 From: Brian Sheedy Date: Tue, 28 Jun 2022 23:34:56 +0000 Subject: [PATCH 48/59] [M102] Let GPU Intel Macs target 12.4 Adds Mac 12.4 as a valid OS dimension for the stable Intel Mac Mini mixin, as the experimental bot seems pretty happy with the OS upgrade. (cherry picked from commit 474c9f01cb4aa3dd5f192b7e9d9478c3cd0f0403) Bug: 1334335 Change-Id: I7640208673c90a87202eee73aafd0f42764fbfb4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3716986 Auto-Submit: Brian Sheedy Reviewed-by: Yuly Novikov Commit-Queue: Yuly Novikov Cr-Original-Commit-Position: refs/heads/main@{#1017135} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3733168 Commit-Queue: Brian Sheedy Cr-Commit-Position: refs/branch-heads/5005@{#1207} Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} --- testing/buildbot/chromium.angle.json | 22 +-- testing/buildbot/chromium.dawn.json | 48 ++--- testing/buildbot/chromium.gpu.fyi.json | 182 +++++++++---------- testing/buildbot/chromium.gpu.json | 56 +++--- testing/buildbot/chromium.swangle.json | 2 +- testing/buildbot/client.v8.fyi.json | 18 +- testing/buildbot/mixins.pyl | 2 +- testing/buildbot/tryserver.chromium.mac.json | 36 ++-- 8 files changed, 183 insertions(+), 183 deletions(-) diff --git a/testing/buildbot/chromium.angle.json b/testing/buildbot/chromium.angle.json index 0130290604aa..f4883ec8b7a4 100644 --- a/testing/buildbot/chromium.angle.json +++ b/testing/buildbot/chromium.angle.json @@ -302,7 +302,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "named_caches": [ @@ -362,7 +362,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "named_caches": [ @@ -1792,7 +1792,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1817,7 +1817,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1859,7 +1859,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1897,7 +1897,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1936,7 +1936,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1974,7 +1974,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2012,7 +2012,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2050,7 +2050,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2087,7 +2087,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json index a128043e8aea..f1584918902f 100644 --- a/testing/buildbot/chromium.dawn.json +++ b/testing/buildbot/chromium.dawn.json @@ -1783,7 +1783,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1810,7 +1810,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1837,7 +1837,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1864,7 +1864,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1889,7 +1889,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1912,7 +1912,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1943,7 +1943,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1967,7 +1967,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2005,7 +2005,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2043,7 +2043,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2078,7 +2078,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2116,7 +2116,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2972,7 +2972,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2999,7 +2999,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3026,7 +3026,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3053,7 +3053,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3078,7 +3078,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3101,7 +3101,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3132,7 +3132,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3156,7 +3156,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -3194,7 +3194,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3232,7 +3232,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -3267,7 +3267,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -3305,7 +3305,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 6c004533a068..3c22537f9264 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json @@ -11285,7 +11285,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11314,7 +11314,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11341,7 +11341,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -11368,7 +11368,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11392,7 +11392,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11416,7 +11416,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11437,7 +11437,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11462,7 +11462,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -11500,7 +11500,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11536,7 +11536,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11572,7 +11572,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11608,7 +11608,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11648,7 +11648,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11693,7 +11693,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11738,7 +11738,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11774,7 +11774,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11810,7 +11810,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11855,7 +11855,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11900,7 +11900,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11937,7 +11937,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -11974,7 +11974,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12010,7 +12010,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12048,7 +12048,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12087,7 +12087,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12125,7 +12125,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12163,7 +12163,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12200,7 +12200,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12229,7 +12229,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12257,7 +12257,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -12284,7 +12284,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12308,7 +12308,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12332,7 +12332,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12353,7 +12353,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12378,7 +12378,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -12416,7 +12416,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12452,7 +12452,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12488,7 +12488,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12528,7 +12528,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12573,7 +12573,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12618,7 +12618,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12655,7 +12655,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12691,7 +12691,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -12728,7 +12728,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -13919,7 +13919,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -13948,7 +13948,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -13975,7 +13975,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -14002,7 +14002,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14026,7 +14026,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14050,7 +14050,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14071,7 +14071,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14096,7 +14096,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14134,7 +14134,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14170,7 +14170,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14206,7 +14206,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14242,7 +14242,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14282,7 +14282,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14327,7 +14327,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14372,7 +14372,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14408,7 +14408,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14444,7 +14444,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14489,7 +14489,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14534,7 +14534,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14561,7 +14561,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -14597,7 +14597,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14634,7 +14634,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14670,7 +14670,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14708,7 +14708,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14747,7 +14747,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14786,7 +14786,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14824,7 +14824,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14862,7 +14862,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14900,7 +14900,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -14937,7 +14937,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21528,7 +21528,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -21549,7 +21549,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -21574,7 +21574,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -21612,7 +21612,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21648,7 +21648,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21684,7 +21684,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21724,7 +21724,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21769,7 +21769,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21805,7 +21805,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21841,7 +21841,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21886,7 +21886,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21923,7 +21923,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21959,7 +21959,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -21991,7 +21991,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -22029,7 +22029,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -22067,7 +22067,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -22105,7 +22105,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -22143,7 +22143,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json index 8269243328ac..3dac7b6281e0 100644 --- a/testing/buildbot/chromium.gpu.json +++ b/testing/buildbot/chromium.gpu.json @@ -1318,7 +1318,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1346,7 +1346,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1373,7 +1373,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1397,7 +1397,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1435,7 +1435,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1471,7 +1471,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1507,7 +1507,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1547,7 +1547,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1592,7 +1592,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1637,7 +1637,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1674,7 +1674,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1710,7 +1710,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1747,7 +1747,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1776,7 +1776,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1805,7 +1805,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1832,7 +1832,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -1859,7 +1859,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1883,7 +1883,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -1921,7 +1921,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1957,7 +1957,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1993,7 +1993,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2033,7 +2033,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2078,7 +2078,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2123,7 +2123,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2150,7 +2150,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -2186,7 +2186,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2222,7 +2222,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -2259,7 +2259,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/chromium.swangle.json b/testing/buildbot/chromium.swangle.json index 3e2f5b239a50..bb05a454c4a6 100644 --- a/testing/buildbot/chromium.swangle.json +++ b/testing/buildbot/chromium.swangle.json @@ -1350,7 +1350,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json index 5947391b0e32..fcd84b91c8c1 100644 --- a/testing/buildbot/client.v8.fyi.json +++ b/testing/buildbot/client.v8.fyi.json @@ -1110,7 +1110,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1145,7 +1145,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1180,7 +1180,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1224,7 +1224,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1268,7 +1268,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1304,7 +1304,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1339,7 +1339,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1376,7 +1376,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1413,7 +1413,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl index 26a150814f00..e628d94166d1 100644 --- a/testing/buildbot/mixins.pyl +++ b/testing/buildbot/mixins.pyl @@ -834,7 +834,7 @@ 'dimensions': { 'cpu': 'x86-64', 'gpu': '8086:3e9b', - 'os': 'Mac-11.5.2', + 'os': 'Mac-11.5.2|Mac-12.4', 'display_attached': '1', }, }, diff --git a/testing/buildbot/tryserver.chromium.mac.json b/testing/buildbot/tryserver.chromium.mac.json index 35722d269397..f4d9e7bdf54d 100644 --- a/testing/buildbot/tryserver.chromium.mac.json +++ b/testing/buildbot/tryserver.chromium.mac.json @@ -73,7 +73,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -146,7 +146,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -228,7 +228,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -304,7 +304,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -378,7 +378,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -452,7 +452,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -576,7 +576,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -668,7 +668,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -780,7 +780,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -854,7 +854,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -946,7 +946,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1022,7 +1022,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1134,7 +1134,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1234,7 +1234,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1313,7 +1313,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1391,7 +1391,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1469,7 +1469,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, @@ -1546,7 +1546,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-11.5.2" + "os": "Mac-11.5.2|Mac-12.4" } ], "idempotent": false, -- 2.37.0