5060: Change the mac builder default to be either Mac11 or Mac12

Once the hosts are all upgraded to Mac11 we will remove the or for Mac11

#BotUpQ22022

Bug: 1323966
Change-Id: I11b57cec17ef3c4a5d9e27b0e1fdb909fd0d6aff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3653823
Auto-Submit: Lindsay Pasricha <lindsayw@chromium.org>
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/branch-heads/5060@{#123}
Cr-Branched-From: b83393d-refs/heads/main@{#1002911}

infra/config/generated/luci/cr-buildbucket.cfg

@@ -3477,7 +3477,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:Mac Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -6747,7 +6747,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:ios-simulator"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -6915,7 +6915,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:ios-simulator-full-configs"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -7818,7 +7818,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:mac-arm64-rel"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -11684,7 +11684,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:ios-simulator"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.try"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -11776,7 +11776,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:ios-simulator-cronet"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.try"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -11868,7 +11868,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builder:ios-simulator-full-configs"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.try"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -14142,7 +14142,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -14232,7 +14232,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-11|Mac-12"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {

infra/config/lib/builders.star

@@ -73,7 +73,8 @@ os = struct(
     MAC_10_15 = os_enum("Mac-10.15", os_category.MAC),
     MAC_11 = os_enum("Mac-11", os_category.MAC),
     MAC_12 = os_enum("Mac-12", os_category.MAC),
-    MAC_DEFAULT = os_enum("Mac-11", os_category.MAC),
+    # TODO(crbug.com/1323966) Remove Mac11 once builders have been migrated to Mac12
+    MAC_DEFAULT = os_enum("Mac-11|Mac-12", os_category.MAC),
     MAC_ANY = os_enum("Mac", os_category.MAC),
     MAC_BETA = os_enum("Mac-12", os_category.MAC),
     WINDOWS_7 = os_enum("Windows-7", os_category.WINDOWS),