Commit b15579b1 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot

Enable task service account on all Goma's RBE builders.

Bug: 1105814
Change-Id: I78028c4e5f5bda13174090984675600270a011b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359026
Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798538}
parent 3fe20a7b
This diff is collapsed.
...@@ -155,6 +155,7 @@ def fyi_goma_rbe_canary_builder( ...@@ -155,6 +155,7 @@ def fyi_goma_rbe_canary_builder(
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.goma.fyi", mastername = "chromium.goma.fyi",
os = os, os = os,
goma_use_luci_auth = True,
**kwargs **kwargs
) )
...@@ -315,6 +316,7 @@ def fyi_goma_rbe_latest_client_builder( ...@@ -315,6 +316,7 @@ def fyi_goma_rbe_latest_client_builder(
goma_backend = goma_backend, goma_backend = goma_backend,
mastername = "chromium.goma.fyi", mastername = "chromium.goma.fyi",
os = os, os = os,
goma_use_luci_auth = True,
**kwargs **kwargs
) )
...@@ -383,12 +385,19 @@ fyi_goma_rbe_latest_client_builder( ...@@ -383,12 +385,19 @@ fyi_goma_rbe_latest_client_builder(
os = os.MAC_DEFAULT, os = os.MAC_DEFAULT,
) )
def goma_builder(*, name, builderless = False, os = os.LINUX_DEFAULT, **kwargs): def goma_builder(
*,
name,
builderless = False,
os = os.LINUX_DEFAULT,
goma_use_luci_auth = True,
**kwargs):
return builder( return builder(
name = name, name = name,
builderless = builderless, builderless = builderless,
mastername = "chromium.goma", mastername = "chromium.goma",
os = os, os = os,
goma_use_luci_auth = goma_use_luci_auth,
**kwargs **kwargs
) )
...@@ -401,14 +410,12 @@ goma_builder( ...@@ -401,14 +410,12 @@ goma_builder(
name = "Chromium Android ARM 32-bit Goma RBE ToT", name = "Chromium Android ARM 32-bit Goma RBE ToT",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_enable_ats = False, goma_enable_ats = False,
goma_use_luci_auth = True,
) )
goma_builder( goma_builder(
name = "Chromium Android ARM 32-bit Goma RBE ToT (ATS)", name = "Chromium Android ARM 32-bit Goma RBE ToT (ATS)",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_enable_ats = True, goma_enable_ats = True,
goma_use_luci_auth = True,
) )
goma_builder( goma_builder(
...@@ -433,28 +440,33 @@ goma_builder( ...@@ -433,28 +440,33 @@ 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(
name = "Chromium Linux Goma RBE ToT", name = "Chromium Linux Goma RBE ToT",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_enable_ats = False, goma_enable_ats = False,
goma_use_luci_auth = True,
) )
goma_builder( goma_builder(
name = "Chromium Linux Goma RBE ToT (ATS)", name = "Chromium Linux Goma RBE ToT (ATS)",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_enable_ats = True, goma_enable_ats = True,
goma_use_luci_auth = True,
) )
def goma_mac_builder(*, name, os = os.MAC_DEFAULT, **kwargs): def goma_mac_builder(
*,
name,
os = os.MAC_DEFAULT,
goma_use_luci_auth = True,
**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
) )
...@@ -462,7 +474,6 @@ goma_mac_builder( ...@@ -462,7 +474,6 @@ goma_mac_builder(
name = "Chromium iOS Goma RBE ToT", name = "Chromium iOS Goma RBE ToT",
caches = [xcode_cache.x11e146], caches = [xcode_cache.x11e146],
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_use_luci_auth = True,
os = os.MAC_10_14, os = os.MAC_10_14,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "11e146",
...@@ -487,18 +498,25 @@ goma_mac_builder( ...@@ -487,18 +498,25 @@ goma_mac_builder(
goma_mac_builder( goma_mac_builder(
name = "Chromium Mac Goma RBE ToT", name = "Chromium Mac Goma RBE ToT",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_use_luci_auth = True,
) )
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(*, name, goma_enable_ats = True, cores = 32, **kwargs): def goma_windows_builder(
*,
name,
goma_enable_ats = True,
goma_use_luci_auth = True,
cores = 32,
**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
) )
...@@ -516,11 +534,11 @@ goma_windows_builder( ...@@ -516,11 +534,11 @@ goma_windows_builder(
goma_windows_builder( goma_windows_builder(
name = "Chromium Win Goma RBE ToT", name = "Chromium Win Goma RBE ToT",
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
goma_use_luci_auth = True,
) )
goma_windows_builder( 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