Skip to content

GitLab

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

infra: Set Linux builders to use Goma RBE by default 

These builder def functions set Goma RBE backend by default:

ci.star:
- gpu_fyi_linux_builder()
- linux_builder()

try.star:
- gpu_linux_builder()
- linux_builder()

Bug: 1025325
Change-Id: Id013d72d11744a7192790fe1fa60c2b4e4dfb616
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933829Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718963}
parent cd24a062
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 101 deletions
infra/config/buckets/ci.star
View file @ bfd5c882
......@@ -1432,117 +1432,98 @@ def gpu_fyi_linux_builder(
*,
name,
execution_timeout=6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
**kwargs):
return gpu_fyi_builder(
name = name,
execution_timeout = execution_timeout,
goma_backend = goma_backend,
**kwargs
)
gpu_fyi_linux_builder(
name = 'Android FYI 32 Vk Release (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI 32 dEQP Vk Release (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI 64 Perf (Pixel 2)',
cores = 2,
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI 64 Vk Release (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI 64 dEQP Vk Release (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (NVIDIA Shield TV)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Nexus 5)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Nexus 6)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Nexus 6P)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Nexus 9)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI Release (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI SkiaRenderer GL (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI SkiaRenderer Vulkan (Pixel 2)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Android FYI dEQP Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'GPU FYI Linux Builder',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'GPU FYI Linux Builder (dbg)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'GPU FYI Linux Ozone Builder',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'GPU FYI Linux dEQP Builder',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'GPU FYI Perf Android 64 Builder',
goma_backend = goma.backend.RBE_PROD,
)
gpu_fyi_linux_builder(
name = 'Linux FYI GPU TSAN Release',
goma_backend = goma.backend.RBE_PROD,
)
......@@ -1553,6 +1534,9 @@ def gpu_fyi_linux_ci_tester(*, name, execution_timeout=6 * time.hour, **kwargs):
name = name,
cores = 2,
execution_timeout = execution_timeout,
# Setting goma_backend for testers is a no-op, but better to be explicit
# here and also leave the generated configs unchanged for these testers.
goma_backend = None,
**kwargs
)
......@@ -1903,9 +1887,15 @@ gpu_linux_ci_tester(
)
def linux_builder(*, name, goma_jobs=goma.jobs.MANY_JOBS_FOR_CI, **kwargs):
def linux_builder(
*,
name,
goma_backend = goma.backend.RBE_PROD,
goma_jobs=goma.jobs.MANY_JOBS_FOR_CI,
**kwargs):
return builder(
name = name,
goma_backend = goma_backend,
goma_jobs = goma_jobs,
mastername = 'chromium.linux',
**kwargs
......@@ -1913,19 +1903,16 @@ def linux_builder(*, name, goma_jobs=goma.jobs.MANY_JOBS_FOR_CI, **kwargs):
linux_builder(
name = 'Fuchsia x64',
goma_backend = goma.backend.RBE_PROD,
notifies = ['cr-fuchsia'],
)
linux_builder(
name = 'Cast Audio Linux',
goma_backend = goma.backend.RBE_PROD,
ssd = True,
)
linux_builder(
name = 'Cast Linux',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J50,
)
......@@ -1933,7 +1920,6 @@ linux_builder(
name = 'Deterministic Fuchsia (dbg)',
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
goma_jobs = None,
)
......@@ -1941,7 +1927,6 @@ linux_builder(
name = 'Deterministic Linux',
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1949,28 +1934,23 @@ linux_builder(
cores = 32,
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'Fuchsia ARM64',
goma_backend = goma.backend.RBE_PROD,
notifies = ['cr-fuchsia'],
)
linux_builder(
name = 'Leak Detection Linux',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'Linux Builder (dbg)',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'Linux Builder (dbg)(32)',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1979,19 +1959,16 @@ linux_builder(
linux_builder(
name = 'fuchsia-arm64-cast',
goma_backend = goma.backend.RBE_PROD,
notifies = ['cr-fuchsia'],
)
linux_builder(
name = 'fuchsia-x64-cast',
goma_backend = goma.backend.RBE_PROD,
notifies = ['cr-fuchsia'],
)
linux_builder(
name = 'fuchsia-x64-dbg',
goma_backend = goma.backend.RBE_PROD,
notifies = ['cr-fuchsia'],
)
......@@ -2002,19 +1979,16 @@ linux_builder(
linux_builder(
name = 'linux-ozone-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-trusty-rel',
goma_backend = goma.backend.RBE_PROD,
os = os.LINUX_TRUSTY,
)
linux_builder(
name = 'linux_chromium_component_updater',
executable = luci.recipe(name = 'findit/chromium/update_components'),
goma_backend = goma.backend.RBE_PROD,
service_account = 'component-mapping-updater@chops-service-accounts.iam.gserviceaccount.com'
)
......
infra/config/buckets/try.star
View file @ bfd5c882
......@@ -761,73 +761,61 @@ gpu_android_builder(
def gpu_linux_builder(*, name, **kwargs):
return gpu_builder(
name = name,
goma_backend = goma.backend.RBE_PROD,
mastername = 'tryserver.chromium.linux',
**kwargs
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-intel-dqp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-intel-exp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-intel-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-intel-skv',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-dqp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-exp',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-skv',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-fyi-try-linux-nvidia-tsn',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-try-linux-nvidia-dbg',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'gpu-try-linux-nvidia-rel',
goma_backend = goma.backend.RBE_PROD,
)
gpu_linux_builder(
name = 'linux_optional_gpu_tests_rel',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/chrome/browser/vr/.+',
......@@ -1050,28 +1038,26 @@ gpu_win_builder(
)
def linux_builder(*, name, **kwargs):
def linux_builder(*, name, goma_backend = goma.backend.RBE_PROD, **kwargs):
return try_builder(
name = name,
goma_backend = goma_backend,
mastername = 'tryserver.chromium.linux',
**kwargs
)
linux_builder(
name = 'cast_shell_audio_linux',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'cast_shell_linux',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(),
)
linux_builder(
name = 'closure_compilation',
executable = luci.recipe(name = 'closure_compilation'),
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/third_party/closure_compiler/.+',
......@@ -1081,7 +1067,6 @@ linux_builder(
linux_builder(
name = 'fuchsia-arm64-cast',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/chromecast/.+',
......@@ -1091,7 +1076,6 @@ linux_builder(
linux_builder(
name = 'fuchsia-compile-x64-dbg',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
experiment_percentage = 50,
),
......@@ -1099,22 +1083,18 @@ linux_builder(
linux_builder(
name = 'fuchsia-fyi-arm64-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'fuchsia-fyi-x64-dbg',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'fuchsia-fyi-x64-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'fuchsia-x64-cast',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/chromecast/.+',
......@@ -1124,58 +1104,48 @@ linux_builder(
linux_builder(
name = 'fuchsia_arm64',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(),
)
linux_builder(
name = 'fuchsia_x64',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(),
)
linux_builder(
name = 'layout_test_leak_detection',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'leak_detection_linux',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-annotator-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-blink-heap-concurrent-marking-tsan-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-blink-heap-verification-try',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-clang-tidy-dbg',
executable = luci.recipe(name = 'tricium_clang_tidy_wrapper'),
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)
linux_builder(
name = 'linux-clang-tidy-rel',
executable = luci.recipe(name = 'tricium_clang_tidy_wrapper'),
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)
linux_builder(
name = 'linux-dcheck-off-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1186,52 +1156,43 @@ linux_builder(
linux_builder(
name = 'linux-libfuzzer-asan-rel',
executable = luci.recipe(name = 'chromium_libfuzzer_trybot'),
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(),
)
linux_builder(
name = 'linux-ozone-rel',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(),
)
linux_builder(
name = 'linux-trusty-rel',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
os = os.LINUX_TRUSTY,
)
linux_builder(
name = 'linux-viz-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-webkit-msan-rel',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_arm',
goma_backend = goma.backend.RBE_PROD,
goma_enable_ats = True,
)
linux_builder(
name = 'linux_chromium_analysis',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_chromium_archive_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_chromium_asan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
ssd = True,
tryjob = tryjob(),
......@@ -1240,18 +1201,15 @@ linux_builder(
linux_builder(
name = 'linux_chromium_cfi_rel_ng',
cores = 32,
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_chromium_chromeos_asan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)
linux_builder(
name = 'linux_chromium_chromeos_msan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)
......@@ -1259,17 +1217,14 @@ linux_builder(
name = 'linux_chromium_clobber_deterministic',
executable = luci.recipe(name = 'swarming/deterministic_build'),
execution_timeout = 6 * time.hour,
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_chromium_clobber_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_chromium_compile_dbg_32_ng',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1280,14 +1235,12 @@ linux_builder(
path = 'linux_debug',
),
],
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
tryjob = tryjob(),
)
linux_builder(
name = 'linux_chromium_compile_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1298,7 +1251,6 @@ linux_builder(
path = 'linux_debug',
),
],
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/build/.*check_gn_headers.*',
......@@ -1308,25 +1260,21 @@ linux_builder(
linux_builder(
name = 'linux_chromium_msan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
)
linux_builder(
name = 'linux_chromium_tsan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
tryjob = tryjob(),
)
linux_builder(
name = 'linux_chromium_ubsan_rel_ng',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_layout_tests_composite_after_paint',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/third_party/blink/renderer/core/paint/.+',
......@@ -1340,7 +1288,6 @@ linux_builder(
linux_builder(
name = 'linux_layout_tests_layout_ng_disabled',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/third_party/blink/renderer/core/editing/.+',
......@@ -1356,22 +1303,18 @@ linux_builder(
linux_builder(
name = 'linux-layout-tests-fragment-item',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux-layout-tests-fragment-paint',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_mojo',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
name = 'linux_mojo_chromeos',
goma_backend = goma.backend.RBE_PROD,
)
linux_builder(
......@@ -1385,7 +1328,6 @@ linux_builder(
linux_builder(
name = 'linux_vr',
goma_backend = goma.backend.RBE_PROD,
tryjob = tryjob(
location_regexp = [
'.+/[+]/chrome/browser/vr/.+',
......@@ -1396,7 +1338,6 @@ linux_builder(
linux_builder(
name = 'tricium-metrics-analysis',
executable = luci.recipe(name = 'tricium_metrics'),
goma_backend = goma.backend.RBE_PROD,
)
......
infra/config/generated/cr-buildbucket.cfg
View file @ bfd5c882
......@@ -3063,7 +3063,7 @@ buckets: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"jobs\":500}"
properties_j: "$build/goma:{\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.linux\""
>
......
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