Switch the mac bots to 10.14+.

All macs previously on 10.13 in luci.flex.{ci,try} were upgraded to
10.15 in crbug.com/1128042 and crbug.com/1128044, respectively.

This also fixes the OS configuration for two ios bots on ci that
I had missed in an earlier CL.

Change-Id: I845283deb21dde85707ec44d344c14c12828c63a
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2421798
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
This commit is contained in:
John Budorick 2020-09-21 07:37:48 -07:00 committed by Commit Bot
parent 44612ad6af
commit ff705b66af
2 changed files with 11 additions and 13 deletions

View File

@ -340,7 +340,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -358,7 +358,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -376,7 +376,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -582,7 +582,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -600,7 +600,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -983,7 +983,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -1001,7 +1001,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -1019,7 +1019,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.13"
dimensions: "os:Mac-10.14|Mac-10.15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"

View File

@ -183,10 +183,8 @@ luci.bucket(
def get_os_dimensions(os):
if os == "android":
return {"device_type": "bullhead"}
if os == "ios":
if os == "ios" or os == "mac":
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":
return {"os": "Windows-10", "cores": "8", "cpu": "x86-64"}
elif os == "linux":
@ -315,8 +313,8 @@ 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 Debug", "mac", "iOS", "dbg")
ci_builder("iOS Release", "mac", "iOS", "rel")
ci_builder("iOS Debug", "ios", "iOS", "dbg")
ci_builder("iOS Release", "ios", "iOS", "rel")
try_builder("android", "android")
try_builder("android_arm64", "android")