Skip to content

GitLab

T
tangled
Commit 1f7ebde5 authored by Simon Que's avatar Simon Que Committed by Commit Bot
Browse files
Options

infra: Set Mac builders to use Goma RBE by default 

Changes the following builder def functions to set Goma RBE backend by
default:
- in ci.star:
  - fyi_mac_builder()
  - gpu_fyi_mac_builder()
  - mac_builder()
- in try.star:
  - blink_mac_builder()
  - gpu_mac_builder()
  - mac_builder()

The changes to cr-buildbucket.cfg are all for setting Goma RBE as the
default for testers, which is a no-op.

Bug: 1025325
Change-Id: Ica7fc988f387c97a9eaada694dd5bb066e6ebbac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1924333Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716879}
parent 763b7d5b
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 47 deletions
infra/config/buckets/ci.star
View file @ 1f7ebde5
......@@ -1339,6 +1339,7 @@ def fyi_mac_builder(
return fyi_builder(
name = name,
cores = cores,
goma_backend = goma.backend.RBE_PROD,
os = os,
**kwargs
)
......@@ -1347,7 +1348,6 @@ fyi_mac_builder(
name = 'Mac Builder Next',
cores = None,
os = os.MAC_10_14,
goma_backend = goma.backend.RBE_PROD,
)
fyi_mac_builder(
......@@ -1361,7 +1361,6 @@ fyi_mac_builder(
cores = None,
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
fyi_mac_builder(
......@@ -1369,18 +1368,15 @@ fyi_mac_builder(
cores = None,
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
fyi_mac_builder(
name = 'mac-hermetic-upgrade-rel',
cores = 8,
goma_backend = goma.backend.RBE_PROD,
)
fyi_mac_builder(
name = 'mac-mojo-rel',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
)
......@@ -1752,28 +1748,25 @@ def gpu_fyi_mac_builder(*, name, **kwargs):
name = name,
cores = 4,
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
**kwargs
)
gpu_fyi_mac_builder(
name = 'Mac FYI GPU ASAN Release',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_mac_builder(
name = 'GPU FYI Mac Builder',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_mac_builder(
name = 'GPU FYI Mac Builder (dbg)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_mac_builder(
name = 'GPU FYI Mac dEQP Builder',
goma_backend = goma.backend.RBE_PROD,
)
......@@ -2021,10 +2014,17 @@ linux_builder(
)
def mac_builder(*, name, cores=None, os=os.MAC_DEFAULT, **kwargs):
def mac_builder(
*,
name,
cores=None,
goma_backend = goma.backend.RBE_PROD,
os=os.MAC_DEFAULT,
**kwargs):
return builder(
name = name,
cores = cores,
goma_backend = goma_backend,
mastername = 'chromium.mac',
os = os,
**kwargs
......@@ -2032,12 +2032,10 @@ def mac_builder(*, name, cores=None, os=os.MAC_DEFAULT, **kwargs):
mac_builder(
name = 'Mac Builder',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'Mac Builder (dbg)',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
)
......@@ -2068,7 +2066,6 @@ mac_builder(
mac_builder(
name = 'WebKit Mac10.13 (retina)',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_10_13,
)
......@@ -2077,6 +2074,7 @@ def mac_ios_builder(*, name, **kwargs):
name = name,
caches = [XCODE_IOS_11_CACHE],
executable = luci.recipe(name = 'ios/unified_builder_tester'),
goma_backend = None,
os = os.MAC_ANY,
**kwargs
)
......
infra/config/buckets/try.star
View file @ 1f7ebde5
......@@ -396,9 +396,10 @@ angle_builder(
)
def blink_builder(*, name, **kwargs):
def blink_builder(*, name, goma_backend = None, **kwargs):
return try_builder(
name = name,
goma_backend = goma_backend,
mastername = 'tryserver.blink',
**kwargs
)
......@@ -433,33 +434,29 @@ def blink_mac_builder(*, name, **kwargs):
return blink_builder(
name = name,
cores = None,
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY,
**kwargs
)
blink_mac_builder(
name = 'mac10.10-blink-rel',
goma_backend = goma.backend.RBE_PROD,
)
blink_mac_builder(
name = 'mac10.11-blink-rel',
goma_backend = goma.backend.RBE_PROD,
)
blink_mac_builder(
name = 'mac10.12-blink-rel',
goma_backend = goma.backend.RBE_PROD,
)
blink_mac_builder(
name = 'mac10.13-blink-rel',
goma_backend = goma.backend.RBE_PROD,
)
blink_mac_builder(
name = 'mac10.13_retina-blink-rel',
goma_backend = goma.backend.RBE_PROD,
)
......@@ -850,6 +847,7 @@ def gpu_mac_builder(*, name, **kwargs):
return gpu_builder(
name = name,
cores = None,
goma_backend = goma.backend.RBE_PROD,
mastername = 'tryserver.chromium.mac',
os = os.MAC_ANY,
**kwargs
......@@ -857,57 +855,46 @@ def gpu_mac_builder(*, name, **kwargs):
gpu_mac_builder(
name = 'gpu-fyi-try-mac-amd-dqp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-amd-pro-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-amd-retina-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-amd-retina-exp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-amd-retina-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-asan',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-intel-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-intel-dqp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-intel-exp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-intel-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-nvidia-retina-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
......@@ -916,27 +903,22 @@ gpu_mac_builder(
# If it gets more, the modified execution_timeout should be removed.
# See crbug.com/853307 for more context.
execution_timeout = 12 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-fyi-try-mac-nvidia-retina-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-try-mac-amd-retina-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'gpu-try-mac-intel-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_mac_builder(
name = 'mac_optional_gpu_tests_rel',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/chrome/browser/vr/.+',
......@@ -1412,10 +1394,17 @@ linux_builder(
)
def mac_builder(*, name, cores=None, os=os.MAC_ANY, **kwargs):
def mac_builder(
*,
name,
cores=None,
goma_backend = goma.backend.RBE_PROD,
os=os.MAC_ANY,
**kwargs):
return try_builder(
name = name,
cores = cores,
goma_backend = goma_backend,
mastername = 'tryserver.chromium.mac',
os = os,
**kwargs
......@@ -1424,14 +1413,12 @@ def mac_builder(*, name, cores=None, os=os.MAC_ANY, **kwargs):
mac_builder(
name = 'mac-osxbeta-rel',
builderless = True,
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_DEFAULT,
ssd = True,
)
mac_builder(
name = 'mac-rel',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
tryjob = tryjob(),
)
......@@ -1441,39 +1428,32 @@ mac_builder(
# The 10.xx version translates to which bots will run isolated tests.
mac_builder(
name = 'mac_chromium_10.10',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_10.12_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_10.13_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_10.14_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_archive_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_asan_rel_ng',
goma_jobs = goma.jobs.J150,
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_compile_dbg_ng',
builderless = True,
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
os = os.MAC_10_13,
ssd = True,
......@@ -1482,12 +1462,10 @@ mac_builder(
mac_builder(
name = 'mac_chromium_compile_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
name = 'mac_chromium_dbg_ng',
goma_backend = goma.backend.RBE_PROD,
)
mac_builder(
......
infra/config/generated/cr-buildbucket.cfg
View file @ 1f7ebde5
......@@ -3739,6 +3739,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.mac\""
>
......@@ -3757,6 +3758,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.mac\""
>
......@@ -3775,6 +3777,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.mac\""
>
......@@ -3793,6 +3796,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.mac\""
>
......@@ -3811,6 +3815,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.mac\""
>
......@@ -3829,6 +3834,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.fyi\""
>
......
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