Update Mac version in bots

Bug: 448679376
Change-Id: I077cd31073889afe0519195a8c459570bc95e4a8
This commit is contained in:
Victor Hugo Vianna Silva 2025-10-14 11:19:15 +01:00
parent f5c7d8a44d
commit 5e082a1e31
3 changed files with 68 additions and 11 deletions

View File

@ -336,7 +336,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -354,7 +354,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -372,7 +372,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -542,7 +542,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -560,7 +560,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.ci"
recipe {
name: "libyuv/libyuv"
@ -718,7 +718,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -728,6 +728,10 @@ buckets {
properties_j: "builder_group:\"tryserver.libyuv\""
}
execution_timeout_secs: 10800
caches {
name: "macos_sdk"
path: "macos_sdk"
}
build_numbers: YES
service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@ -736,7 +740,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -746,6 +750,10 @@ buckets {
properties_j: "builder_group:\"tryserver.libyuv\""
}
execution_timeout_secs: 10800
caches {
name: "macos_sdk"
path: "macos_sdk"
}
build_numbers: YES
service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@ -906,7 +914,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -916,6 +924,10 @@ buckets {
properties_j: "builder_group:\"tryserver.libyuv\""
}
execution_timeout_secs: 10800
caches {
name: "macos_sdk"
path: "macos_sdk"
}
build_numbers: YES
service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@ -924,7 +936,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -934,6 +946,10 @@ buckets {
properties_j: "builder_group:\"tryserver.libyuv\""
}
execution_timeout_secs: 10800
caches {
name: "macos_sdk"
path: "macos_sdk"
}
build_numbers: YES
service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@ -942,7 +958,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-15"
dimensions: "pool:luci.flex.try"
recipe {
name: "libyuv/libyuv"
@ -952,6 +968,10 @@ buckets {
properties_j: "builder_group:\"tryserver.libyuv\""
}
execution_timeout_secs: 10800
caches {
name: "macos_sdk"
path: "macos_sdk"
}
build_numbers: YES
service_account: "libyuv-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}

View File

@ -191,7 +191,7 @@ def get_os_dimensions(os):
if os == "android":
return {"device_type": "walleye"}
if os == "ios" or os == "mac":
return {"os": "Mac-12", "cpu": "x86-64"}
return {"os": "Mac-15", "cpu": "x86-64"}
elif os == "win":
return {"os": "Windows-10", "cores": "8", "cpu": "x86-64"}
elif os == "linux":
@ -229,6 +229,7 @@ def libyuv_try_builder(name, dimensions, properties, recipe_name = "libyuv/libyu
name = recipe_name,
cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
),
caches = [swarming.cache("macos_sdk", name = "macos_sdk")] if dimensions.get("os") == "Mac-15" else []
)
def get_build_properties(bucket):

View File

@ -0,0 +1,36 @@
# Copyright 2025 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
from recipe_engine.recipe_api import Property
from recipe_engine.config import ConfigGroup, Single
DEPS = [
'recipe_engine/cipd',
'recipe_engine/context',
'recipe_engine/json',
'recipe_engine/path',
'recipe_engine/platform',
'recipe_engine/step',
]
PROPERTIES = {
'$libyuv/macos_sdk':
Property(
help='Properties specifically for the macos_sdk module.',
param_name='sdk_properties',
kind=ConfigGroup(
sdk_version=Single(str),
tool_pkg=Single(str),
tool_ver=Single(str),
),
default={
# See https://xcodereleases.com/.
'sdk_version':
'16c5032a', # Xcode 16.2
'tool_package':
'infra/tools/mac_toolchain/${platform}',
'tool_version':
'git_revision:29f9c476dd951c2dd7b0d43fa10ac2bd3f185787',
},
)
}