Reland "Change the mac builder default to be either 10.13 or 10.15."

This is a reland of 11c26e5e

Original change's description:
> Change the mac builder default to be either 10.13 or 10.15.
> 
> Once the hosts are all upgraded to 10.15 we will remove the 10.13 option.
> 
> Bug: 1121185
> Change-Id: I3177749f79ddd16b9d725693f21e79ebd752c22c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2412757
> Commit-Queue: Erik Staab <estaab@chromium.org>
> Auto-Submit: Erik Staab <estaab@chromium.org>
> Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807218}

Bug: 1121185
Change-Id: I0b4e69122fc7b80165ca2abbd2542c24ba88d0d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413529
Auto-Submit: Erik Staab <estaab@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807488}

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

@@ -136,7 +136,7 @@ buckets {
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       recipe {
         name: "swarming/staging"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"

infra/config/generated/cr-buildbucket.cfg

@@ -3290,7 +3290,7 @@ buckets {
       dimensions: "builder:Libfuzzer Upload Mac ASan"
       dimensions: "cores:24"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -4622,7 +4622,7 @@ buckets {
       dimensions: "builder:Mac ASAN Release"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -4650,7 +4650,7 @@ buckets {
       dimensions: "builder:Mac ASAN Release Media"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -4677,7 +4677,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac ASan 64 Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -4705,7 +4705,7 @@ buckets {
       dimensions: "builder:Mac ASan 64 Tests (1)"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -5332,7 +5332,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac deterministic"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -11404,7 +11404,7 @@ buckets {
       dimensions: "builder:mac-archive-dbg"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -11432,7 +11432,7 @@ buckets {
       dimensions: "builder:mac-archive-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -11545,7 +11545,7 @@ buckets {
       dimensions: "builder:mac-hermetic-upgrade-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -11712,7 +11712,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15763,7 +15763,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15785,7 +15785,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15807,7 +15807,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging (dbg)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15829,7 +15829,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE ToT"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15851,7 +15851,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma Staging"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16079,7 +16079,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16101,7 +16101,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Canary (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16123,7 +16123,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Latest Client"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16145,7 +16145,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Latest Client (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16167,7 +16167,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma RBE Canary (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16189,7 +16189,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma RBE Latest Client (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16211,7 +16211,7 @@ buckets {
       dimensions: "builder:Mac Builder Goma Canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16233,7 +16233,7 @@ buckets {
       dimensions: "builder:Mac Builder Goma Latest Client"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17033,7 +17033,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17055,7 +17055,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-canary-localoutputcache"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17077,7 +17077,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-latest"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17099,7 +17099,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-latest-localoutputcache"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17121,7 +17121,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-rbe-canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -17143,7 +17143,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-rbe-latest"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -25313,7 +25313,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -25349,7 +25349,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -25888,7 +25888,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -29205,7 +29205,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -29241,7 +29241,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.13|Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {

infra/config/lib/builders.star

@@ -65,7 +65,8 @@ os = struct(
     MAC_10_14 = os_enum("Mac-10.14", os_category.MAC),
     MAC_10_15 = os_enum("Mac-10.15", os_category.MAC),
     MAC_11_0 = os_enum("Mac-11.0", os_category.MAC),
-    MAC_DEFAULT = os_enum("Mac-10.13", os_category.MAC),
+    # TODO(crbug/1121185): Remove 10.13 once builders have been migrated to 10.15.
+    MAC_DEFAULT = os_enum("Mac-10.13|Mac-10.15", os_category.MAC),
     MAC_ANY = os_enum("Mac", os_category.MAC),
     WINDOWS_7 = os_enum("Windows-7", os_category.WINDOWS),
     WINDOWS_8_1 = os_enum("Windows-8.1", os_category.WINDOWS),

infra/config/subprojects/chromium/try.star

@@ -1115,7 +1115,7 @@ try_.chromium_mac_builder(
     branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
     main_list_view = settings.main_list_view_name,
-    os = os.MAC_10_13,
+    os = os.MAC_DEFAULT,
     tryjob = try_.job(),
 )
 
@@ -1167,7 +1167,7 @@ try_.chromium_mac_builder(
     name = "mac_chromium_compile_dbg_ng",
     branch_selector = branches.STANDARD_RELEASES,
     goma_jobs = goma.jobs.J150,
-    os = os.MAC_10_13,
+    os = os.MAC_DEFAULT,
     main_list_view = settings.main_list_view_name,
     tryjob = try_.job(cancel_stale = False),
 )

infra/config/subprojects/chromium/versioned/m85/buckets/try.star

@@ -445,14 +445,14 @@ try_.chromium_linux_builder(
 try_.chromium_mac_builder(
     name = "mac-rel",
     goma_jobs = goma.jobs.J150,
-    os = os.MAC_10_13,
+    os = os.MAC_DEFAULT,
     tryjob = try_.job(),
 )
 
 try_.chromium_mac_builder(
     name = "mac_chromium_compile_dbg_ng",
     goma_jobs = goma.jobs.J150,
-    os = os.MAC_10_13,
+    os = os.MAC_DEFAULT,
     tryjob = try_.job(),
 )