Commit 326dbeac authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot

infra/config: fix builders configs to use Goma RBE.

Bug: 1129409
Change-Id: I5f1c14ff6f3f15f3fe29d59296171edf67897fc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416837
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Reviewed-by: default avatarFumitoshi Ukai <ukai@google.com>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808228}
parent a2b6dc6d
...@@ -11295,7 +11295,7 @@ buckets { ...@@ -11295,7 +11295,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
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"
...@@ -11576,7 +11576,7 @@ buckets { ...@@ -11576,7 +11576,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
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"
...@@ -113,6 +113,7 @@ def set_defaults(milestone_vars, **kwargs): ...@@ -113,6 +113,7 @@ def set_defaults(milestone_vars, **kwargs):
swarming_tags = ["vpython:native-python-wrapper"], swarming_tags = ["vpython:native-python-wrapper"],
triggered_by = [milestone_vars.ci_poller], triggered_by = [milestone_vars.ci_poller],
goma_use_luci_auth = True, goma_use_luci_auth = True,
# TODO(crbug.com/1129723): set default goma_backend here.
) )
default_values.update(kwargs) default_values.update(kwargs)
for k, v in default_values.items(): for k, v in default_values.items():
......
...@@ -2526,7 +2526,7 @@ ci.fyi_builder( ...@@ -2526,7 +2526,7 @@ ci.fyi_builder(
category = "linux", category = "linux",
), ),
experimental = True, experimental = True,
goma_backend = None, goma_backend = goma.backend.RBE_PROD,
) )
# This is launching & collecting entirely isolated tests. # This is launching & collecting entirely isolated tests.
...@@ -2537,7 +2537,7 @@ ci.fyi_builder( ...@@ -2537,7 +2537,7 @@ ci.fyi_builder(
category = "mac", category = "mac",
short_name = "beta", short_name = "beta",
), ),
goma_backend = None, goma_backend = goma.backend.RBE_PROD,
main_console_view = None, main_console_view = None,
triggered_by = ["ci/Mac Builder"], triggered_by = ["ci/Mac Builder"],
) )
......
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