Skip to content

GitLab

T
tangled
Commit 4e9cb83f authored by Fumitoshi Ukai's avatar Fumitoshi Ukai Committed by Commit Bot
Browse files
Options

goma: use xcode 12a8189n for ios builders 

Bug: 1121776, 1123704
Change-Id: I15df4eca2d27a3a36f9d980b851b1fec76c3cdb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2394839Reviewed-by: default avatarYoshisato Yanagisawa <yyanagisawa@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/master@{#804662}
parent b2061e74
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
infra/config/generated/cr-buildbucket.cfg
View file @ 4e9cb83f
...@@ -15687,11 +15687,11 @@ buckets { ...@@ -15687,11 +15687,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"jobs\":80,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11e146\"}" properties: "{\"$build/goma\":{\"jobs\":80,\"rpc_extra_params\":\"?tot\",\"server_host\":\"staging-goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189n\"}"
execution_timeout_secs: 10800 execution_timeout_secs: 10800
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_12a8189n"
path: "xcode_ios_11e146.app" path: "xcode_ios_12a8189n.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -16496,11 +16496,11 @@ buckets { ...@@ -16496,11 +16496,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11e146\"}" properties: "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189n\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_12a8189n"
path: "xcode_ios_11e146.app" path: "xcode_ios_12a8189n.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -16521,11 +16521,11 @@ buckets { ...@@ -16521,11 +16521,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11e146\"}" properties: "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189n\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_12a8189n"
path: "xcode_ios_11e146.app" path: "xcode_ios_12a8189n.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -16546,11 +16546,11 @@ buckets { ...@@ -16546,11 +16546,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11e146\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189n\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_12a8189n"
path: "xcode_ios_11e146.app" path: "xcode_ios_12a8189n.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -16571,11 +16571,11 @@ buckets { ...@@ -16571,11 +16571,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"11e146\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"builder_group\":\"chromium.goma.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189n\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_12a8189n"
path: "xcode_ios_11e146.app" path: "xcode_ios_12a8189n.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
infra/config/subprojects/goma/goma.star
View file @ 4e9cb83f
...@@ -110,11 +110,11 @@ fyi_goma_canary_builder( ...@@ -110,11 +110,11 @@ fyi_goma_canary_builder(
fyi_goma_canary_builder( fyi_goma_canary_builder(
name = "ios-device-goma-canary-clobber", name = "ios-device-goma-canary-clobber",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x12a8189n],
cores = None, cores = None,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "12a8189n",
}, },
) )
...@@ -186,11 +186,11 @@ fyi_goma_rbe_canary_builder( ...@@ -186,11 +186,11 @@ fyi_goma_rbe_canary_builder(
fyi_goma_rbe_canary_builder( fyi_goma_rbe_canary_builder(
name = "ios-device-goma-rbe-canary-clobber", name = "ios-device-goma-rbe-canary-clobber",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x12a8189n],
cores = None, cores = None,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "12a8189n",
}, },
) )
...@@ -271,11 +271,11 @@ fyi_goma_latest_client_builder( ...@@ -271,11 +271,11 @@ fyi_goma_latest_client_builder(
fyi_goma_latest_client_builder( fyi_goma_latest_client_builder(
name = "ios-device-goma-latest-clobber", name = "ios-device-goma-latest-clobber",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x12a8189n],
cores = None, cores = None,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "12a8189n",
}, },
) )
...@@ -361,11 +361,11 @@ fyi_goma_rbe_latest_client_builder( ...@@ -361,11 +361,11 @@ fyi_goma_rbe_latest_client_builder(
fyi_goma_rbe_latest_client_builder( fyi_goma_rbe_latest_client_builder(
name = "ios-device-goma-rbe-latest-clobber", name = "ios-device-goma-rbe-latest-clobber",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x12a8189n],
cores = None, cores = None,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "12a8189n",
}, },
) )
...@@ -484,11 +484,11 @@ def goma_mac_builder( ...@@ -484,11 +484,11 @@ def goma_mac_builder(
goma_mac_builder( goma_mac_builder(
name = "Chromium iOS Goma RBE ToT", name = "Chromium iOS Goma RBE ToT",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x12a8189n],
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
os = os.MAC_10_14, os = os.MAC_10_14,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "12a8189n",
}, },
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment