From 9913db732e8bd6f32a403b6951c2a95cace1348c Mon Sep 17 00:00:00 2001 From: John Budorick Date: Wed, 9 Sep 2020 14:26:25 +0000 Subject: [PATCH] Revert "Upgrade the ios bots to 10.14+." This reverts commit a0656aa01b61a606aa5f3b6449bdce3dab236921. Reason for revert: os dimensions request 10.14 and 10.15 :( Original change's description: > Upgrade the ios bots to 10.14+. > > These need to be on 10.14 to support toolchain updates rolling > in from chromium (starting w/ crrev.com/c/2042251) > > Bug: 1097306, 1063768 > No-Presubmit: true > No-Try: true > Change-Id: I894a2f4fb9c5f9eb62b214f1d623072f7563cc0a > Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2394176 > Commit-Queue: Mirko Bonadei > Reviewed-by: Mirko Bonadei TBR=mbonadei@chromium.org,jleconte@google.com,jbudorick@chromium.org Change-Id: Ib20439a4a9735e90d7ed5722df24f1da47da34bb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1097306 Bug: 1063768 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2401438 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei --- cr-buildbucket.cfg | 18 ++++++------------ main.star | 16 +++++++--------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg index 012b61c65..6e8ad87af 100644 --- a/cr-buildbucket.cfg +++ b/cr-buildbucket.cfg @@ -546,8 +546,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -565,8 +564,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.ci" recipe { name: "libyuv/libyuv" @@ -761,8 +759,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" @@ -780,8 +777,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" @@ -799,8 +795,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" @@ -818,8 +813,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.14" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-10.13" dimensions: "pool:luci.flex.try" recipe { name: "libyuv/libyuv" diff --git a/main.star b/main.star index e5885722c..3335566c5 100755 --- a/main.star +++ b/main.star @@ -183,8 +183,6 @@ luci.bucket( def get_os_dimensions(os): if os == "android": return {"device_type": "bullhead"} - if os == "ios": - return {"os": ["Mac-10.14", "Mac-10.15"], "cpu": "x86-64"} if os == "mac": return {"os": "Mac-10.13", "cpu": "x86-64"} elif os == "win": @@ -196,7 +194,7 @@ def get_os_dimensions(os): def get_os_properties(os): if os == "android": return {"$build/goma": GOMA_BACKEND_RBE_PROD} - elif os in ("ios", "mac"): + elif os == "mac": return {"$build/goma": GOMA_BACKEND_RBE_PROD} elif os == "win": return {"$build/goma": GOMA_BACKEND_RBE_ATS_PROD} @@ -313,8 +311,8 @@ ci_builder("Win64 Debug", "win", "Win|64|Debug", "clg") ci_builder("Win64 Debug (Clang)", "win", "Win|64|Debug", "clg") ci_builder("Win64 Release", "win", "Win|64|Release") ci_builder("Win64 Release (Clang)", "win", "Win|64|Release", "clg") -ci_builder("iOS ARM64 Debug", "ios", "iOS|ARM64", "dbg") -ci_builder("iOS ARM64 Release", "ios", "iOS|ARM64", "rel") +ci_builder("iOS ARM64 Debug", "mac", "iOS|ARM64", "dbg") +ci_builder("iOS ARM64 Release", "mac", "iOS|ARM64", "rel") ci_builder("iOS Debug", "mac", "iOS", "dbg") ci_builder("iOS Release", "mac", "iOS", "rel") @@ -323,10 +321,10 @@ try_builder("android_arm64", "android") try_builder("android_rel", "android") try_builder("android_x64", "linux") try_builder("android_x86", "linux") -try_builder("ios", "ios") -try_builder("ios_arm64", "ios") -try_builder("ios_arm64_rel", "ios") -try_builder("ios_rel", "ios") +try_builder("ios", "mac") +try_builder("ios_arm64", "mac") +try_builder("ios_arm64_rel", "mac") +try_builder("ios_rel", "mac") try_builder("linux", "linux") try_builder("linux_asan", "linux") try_builder("linux_gcc", "linux", experiment_percentage = 100)