From 8f434223ed2195c564964988404897732badc948 Mon Sep 17 00:00:00 2001 From: Haiyang Pan Date: Fri, 11 Jun 2021 19:43:20 +0000 Subject: [PATCH] Update all iOS CI & try builders to accept only Mac 11. As the bots used by these builders are migrated to Mac 11, we should stop using Mac 10.15 and let them run only on Mac 11. Bug: 1213652 Change-Id: Id46a6b9fee3d04e2365af84f2f72600c1931c2a1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2941944 Commit-Queue: Haiyang Pan Reviewed-by: Lindsay Pasricha Cr-Commit-Position: refs/heads/master@{#891760} --- infra/config/generated/cr-buildbucket.cfg | 56 +++++++++++------------ infra/config/lib/builders.star | 6 +-- infra/config/lib/ci.star | 4 +- infra/config/lib/try.star | 2 +- infra/config/subprojects/chromium/ci.star | 6 +-- 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 0ea3f9938c041a..8258e68af12430 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -16355,7 +16355,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ToTiOS" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" dimensions: "ssd:1" recipe { @@ -16429,7 +16429,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ToTiOSDevice" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" dimensions: "ssd:1" recipe { @@ -24361,7 +24361,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-asan" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24434,7 +24434,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-device" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24507,7 +24507,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24580,7 +24580,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-code-coverage" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" dimensions: "ssd:1" recipe { @@ -24655,7 +24655,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-cronet" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24728,7 +24728,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-full-configs" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24801,7 +24801,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-multi-window" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24874,7 +24874,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-noncq" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -24947,7 +24947,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-webkit-tot" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -25020,7 +25020,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios14-beta-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -25093,7 +25093,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios14-sdk-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -25166,7 +25166,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios15-beta-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -25239,7 +25239,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios15-sdk-device" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -25312,7 +25312,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios15-sdk-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.ci" recipe { name: "chromium" @@ -48617,7 +48617,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-device" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -48701,7 +48701,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -48786,7 +48786,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-cronet" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -48870,7 +48870,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-full-configs" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -48955,7 +48955,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-inverse-fieldtrials-fyi" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49039,7 +49039,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-multi-window" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49123,7 +49123,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-noncq" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49207,7 +49207,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios-simulator-rts" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49292,7 +49292,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios14-beta-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49376,7 +49376,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios14-sdk-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-11|Mac-10.16" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49460,7 +49460,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios15-beta-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" @@ -49544,7 +49544,7 @@ buckets { swarming_tags: "vpython:native-python-wrapper" dimensions: "builder:ios15-sdk-simulator" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15|Mac-11" + dimensions: "os:Mac-11" dimensions: "pool:luci.chromium.try" recipe { name: "chromium_trybot" diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star index ff521b9c81f731..92202d023c7d72 100644 --- a/infra/config/lib/builders.star +++ b/infra/config/lib/builders.star @@ -91,11 +91,7 @@ os = struct( MAC_10_13 = os_enum("Mac-10.13", os_category.MAC), MAC_10_14 = os_enum("Mac-10.14", os_category.MAC), MAC_10_15 = os_enum("Mac-10.15", os_category.MAC), - # Staged switch to Mac 11: we can gradually shift the matching capacity - # towards Mac 11 and the builder will continue to run on whatever is - # available - MAC_10_15_OR_11 = os_enum("Mac-10.15|Mac-11", os_category.MAC), - MAC_11 = os_enum("Mac-11|Mac-10.16", os_category.MAC), + MAC_11 = os_enum("Mac-11", 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), diff --git a/infra/config/lib/ci.star b/infra/config/lib/ci.star index 188f042c3bc5d5..bd1dd088763673 100644 --- a/infra/config/lib/ci.star +++ b/infra/config/lib/ci.star @@ -441,7 +441,7 @@ def fyi_ios_builder( name, executable = "recipe:chromium", goma_backend = builders.goma.backend.RBE_PROD, - os = builders.os.MAC_10_15_OR_11, + os = builders.os.MAC_11, xcode = builders.xcode.x12d4e, **kwargs): return fyi_builder( @@ -643,7 +643,7 @@ def mac_ios_builder( name, executable = "recipe:chromium", goma_backend = builders.goma.backend.RBE_PROD, - os = builders.os.MAC_10_15_OR_11, + os = builders.os.MAC_11, xcode = builders.xcode.x12d4e, **kwargs): return mac_builder( diff --git a/infra/config/lib/try.star b/infra/config/lib/try.star index 91453f65b95df1..cc7b655a777fed 100644 --- a/infra/config/lib/try.star +++ b/infra/config/lib/try.star @@ -340,7 +340,7 @@ def chromium_mac_ios_builder( name, executable = "recipe:chromium_trybot", goma_backend = builders.goma.backend.RBE_PROD, - os = builders.os.MAC_10_15_OR_11, + os = builders.os.MAC_11, xcode = builders.xcode.x12d4e, **kwargs): return try_builder( diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star index a1775416356b39..3688a713698a6c 100644 --- a/infra/config/subprojects/chromium/ci.star +++ b/infra/config/subprojects/chromium/ci.star @@ -2337,7 +2337,7 @@ ci.clang_builder( short_name = "sim", ), cores = None, - os = os.MAC_10_15_OR_11, + os = os.MAC_11, ssd = True, xcode = xcode.x12d4e, ) @@ -2350,7 +2350,7 @@ ci.clang_builder( short_name = "dev", ), cores = None, - os = os.MAC_10_15_OR_11, + os = os.MAC_11, ssd = True, xcode = xcode.x12d4e, ) @@ -4083,7 +4083,7 @@ ci.fyi_coverage_builder( short_name = "ios", ), cores = None, - os = os.MAC_10_15_OR_11, + os = os.MAC_11, use_clang_coverage = True, coverage_exclude_sources = "ios_test_files_and_test_utils", coverage_test_types = ["overall", "unit"],