Remove 10.13 OR for mac_default

Bug: 1121185 Change-Id: I7f4d0a0517f7286c120c0dd114d48da90488bd17 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493047 Reviewed-by: Erik Staab <estaab@chromium.org> Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org> Cr-Commit-Position: refs/heads/master@{#820313}
Denger-Network · Oct 23, 2020 · 58ed8a0 · 58ed8a0
1 parent de9a364
commit 58ed8a0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 35 deletions.
diff --git a/infra/config/generated/cr-buildbucket-dev.cfg b/infra/config/generated/cr-buildbucket-dev.cfg
@@ -152,7 +152,7 @@ buckets {
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       recipe {
         name: "swarming/staging"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -4564,7 +4564,7 @@ buckets {
       dimensions: "builder:Libfuzzer Upload Mac ASan"
       dimensions: "cores:24"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -6424,7 +6424,7 @@ buckets {
       dimensions: "builder:Mac ASAN Release"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -6460,7 +6460,7 @@ buckets {
       dimensions: "builder:Mac ASAN Release Media"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -6495,7 +6495,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac ASan 64 Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -6531,7 +6531,7 @@ buckets {
       dimensions: "builder:Mac ASan 64 Tests (1)"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -7512,7 +7512,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac deterministic"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15774,7 +15774,7 @@ buckets {
       dimensions: "builder:mac-archive-dbg"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15810,7 +15810,7 @@ buckets {
       dimensions: "builder:mac-archive-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -15955,7 +15955,7 @@ buckets {
       dimensions: "builder:mac-hermetic-upgrade-rel"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16169,7 +16169,7 @@ buckets {
       dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18128,7 +18128,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18154,7 +18154,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18180,7 +18180,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE Staging (dbg)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18206,7 +18206,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma RBE ToT"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18232,7 +18232,7 @@ buckets {
       dimensions: "builder:Chromium Mac Goma Staging"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18500,7 +18500,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18526,7 +18526,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Canary (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18552,7 +18552,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Latest Client"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18578,7 +18578,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma Latest Client (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18604,7 +18604,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma RBE Canary (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18630,7 +18630,7 @@ buckets {
       dimensions: "builder:Mac Builder (dbg) Goma RBE Latest Client (clobber)"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18656,7 +18656,7 @@ buckets {
       dimensions: "builder:Mac Builder Goma Canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -18682,7 +18682,7 @@ buckets {
       dimensions: "builder:Mac Builder Goma Latest Client"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19622,7 +19622,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19648,7 +19648,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-canary-localoutputcache"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19674,7 +19674,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-latest"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19700,7 +19700,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-latest-localoutputcache"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19726,7 +19726,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-rbe-canary"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -19752,7 +19752,7 @@ buckets {
       dimensions: "builder:mac-archive-rel-goma-rbe-latest"
       dimensions: "cores:4"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -30530,7 +30530,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -30574,7 +30574,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
@@ -31243,7 +31243,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builderless:1"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13|Mac-10.15"
+      dimensions: "os:Mac-10.15"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {

diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
@@ -65,8 +65,7 @@ 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),
-    # 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_DEFAULT = os_enum("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),