Commit 30a5da05 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot

infra/config: use task service account on Goma builders.

Let me make Goma builders to use task service account so that we can
easily distinguish.

Bug: 1105814
Bug: b/166712857
Change-Id: I867bd9c133a97960839828dc2906d615b7450156
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402582
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarFumitoshi Ukai <ukai@google.com>
Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805636}
parent b68279c2
This diff is collapsed.
...@@ -52,6 +52,7 @@ def fyi_goma_canary_builder(*, name, **kwargs): ...@@ -52,6 +52,7 @@ def fyi_goma_canary_builder(*, name, **kwargs):
name = name, name = name,
builder_group = "chromium.goma.fyi", builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
goma_use_luci_auth = True,
**kwargs **kwargs
) )
...@@ -216,6 +217,7 @@ def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs): ...@@ -216,6 +217,7 @@ def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs):
builder_group = "chromium.goma.fyi", builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour, execution_timeout = 10 * time.hour,
os = os, os = os,
goma_use_luci_auth = True,
**kwargs **kwargs
) )
...@@ -390,14 +392,13 @@ def goma_builder( ...@@ -390,14 +392,13 @@ def goma_builder(
name, name,
builderless = False, builderless = False,
os = os.LINUX_DEFAULT, os = os.LINUX_DEFAULT,
goma_use_luci_auth = True,
**kwargs): **kwargs):
return builder( return builder(
name = name, name = name,
builder_group = "chromium.goma", builder_group = "chromium.goma",
builderless = builderless, builderless = builderless,
os = os, os = os,
goma_use_luci_auth = goma_use_luci_auth, goma_use_luci_auth = True,
**kwargs **kwargs
) )
...@@ -446,7 +447,6 @@ goma_builder( ...@@ -446,7 +447,6 @@ goma_builder(
goma_builder( goma_builder(
name = "Chromium Linux Goma Staging", name = "Chromium Linux Goma Staging",
goma_use_luci_auth = False,
) )
goma_builder( goma_builder(
...@@ -471,14 +471,12 @@ def goma_mac_builder( ...@@ -471,14 +471,12 @@ def goma_mac_builder(
*, *,
name, name,
os = os.MAC_DEFAULT, os = os.MAC_DEFAULT,
goma_use_luci_auth = True,
**kwargs): **kwargs):
return goma_builder( return goma_builder(
name = name, name = name,
cores = 4, cores = 4,
goma_jobs = goma.jobs.J80, goma_jobs = goma.jobs.J80,
os = os, os = os,
goma_use_luci_auth = goma_use_luci_auth,
**kwargs **kwargs
) )
...@@ -514,21 +512,18 @@ goma_mac_builder( ...@@ -514,21 +512,18 @@ goma_mac_builder(
goma_mac_builder( goma_mac_builder(
name = "Chromium Mac Goma Staging", name = "Chromium Mac Goma Staging",
goma_use_luci_auth = False,
) )
def goma_windows_builder( def goma_windows_builder(
*, *,
name, name,
goma_enable_ats = True, goma_enable_ats = True,
goma_use_luci_auth = True,
cores = 32, cores = 32,
**kwargs): **kwargs):
return goma_builder( return goma_builder(
name = name, name = name,
cores = cores, cores = cores,
goma_enable_ats = goma_enable_ats, goma_enable_ats = goma_enable_ats,
goma_use_luci_auth = goma_use_luci_auth,
os = os.WINDOWS_DEFAULT, os = os.WINDOWS_DEFAULT,
**kwargs **kwargs
) )
...@@ -552,5 +547,4 @@ goma_windows_builder( ...@@ -552,5 +547,4 @@ goma_windows_builder(
name = "CrWinGomaStaging", name = "CrWinGomaStaging",
cores = 8, cores = 8,
goma_enable_ats = False, goma_enable_ats = False,
goma_use_luci_auth = False,
) )
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