Commit 0f4f1167 authored by Yuly Novikov's avatar Yuly Novikov Committed by Commit Bot

Switch GPU Linux, Android, CrOS CI builders to target luci.chromium.gpu.ci

Including GPU, GPU.FYI, Dawn and SwANGLE builders for trunk and M85.

This is 2nd CL out of 3 moving GPU Linux, Android, CrOS builders GCEs into
luci.chromium.gpu.ci pool.

1. crrev.com/i/3274057
  Allocate GCEs in luci.chromium.gpu.ci pool and increase chrome-gpu quota
2. This CL:
  Switch GPU Linux, Android, CrOS CI builders to trigger tasks in
  luci.chromium.gpu.ci pool
3. crrev.com/i/3274058
  Remove GCEs from luci.chomium.ci pool and decrease chrome-desktop quota

Bug: 1128643
Change-Id: I26c23ea906d4f6ad4300cc51114debdede42915f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2415043Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807972}
parent 2f45c78b
This diff is collapsed.
......@@ -745,11 +745,13 @@ def gpu_fyi_linux_builder(
name,
execution_timeout = 6 * time.hour,
goma_backend = builders.goma.backend.RBE_PROD,
pool = "luci.chromium.gpu.ci",
**kwargs):
return gpu_fyi_builder(
name = name,
execution_timeout = execution_timeout,
goma_backend = goma_backend,
pool = pool,
**kwargs
)
......@@ -777,6 +779,7 @@ def gpu_fyi_thin_tester(
# 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,
pool = "luci.chromium.ci",
**kwargs
)
......@@ -790,7 +793,7 @@ def gpu_fyi_windows_builder(*, name, **kwargs):
**kwargs
)
def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs):
def gpu_builder(*, name, tree_closing = True, notifies = None, pool = "luci.chromium.gpu.ci", **kwargs):
if tree_closing:
notifies = (notifies or []) + ["gpu-tree-closer-email"]
return ci.builder(
......@@ -799,6 +802,7 @@ def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs):
goma_backend = builders.goma.backend.RBE_PROD,
tree_closing = tree_closing,
notifies = notifies,
pool = pool,
**kwargs
)
......@@ -810,6 +814,7 @@ def gpu_thin_tester(*, name, tree_closing = True, **kwargs):
cores = 2,
os = builders.os.LINUX_DEFAULT,
tree_closing = tree_closing,
pool = "luci.chromium.ci",
**kwargs
)
......@@ -914,6 +919,7 @@ def swangle_linux_builder(
name = name,
goma_backend = builders.goma.backend.RBE_PROD,
os = builders.os.LINUX_DEFAULT,
pool = "luci.chromium.gpu.ci",
**kwargs
)
......
......@@ -1557,6 +1557,7 @@ ci.dawn_builder(
category = "ToT|Linux|Builder",
short_name = "x64",
),
pool = "luci.chromium.gpu.ci",
)
ci.dawn_builder(
......@@ -1568,6 +1569,7 @@ ci.dawn_builder(
),
cq_mirrors_console_view = settings.cq_mirrors_console_name,
main_console_view = main_console_if_on_branch(),
pool = "luci.chromium.gpu.ci",
)
ci.dawn_builder(
......@@ -3038,6 +3040,7 @@ ci.gpu_builder(
cq_mirrors_console_view = settings.cq_mirrors_console_name,
main_console_view = main_console_if_on_branch(),
os = os.MAC_ANY,
pool = "luci.chromium.ci",
)
ci.gpu_builder(
......@@ -3047,6 +3050,7 @@ ci.gpu_builder(
),
cores = None,
os = os.MAC_ANY,
pool = "luci.chromium.ci",
tree_closing = False,
)
......@@ -3060,7 +3064,6 @@ ci.gpu_builder(
cq_mirrors_console_view = settings.cq_mirrors_console_name,
main_console_view = main_console_if_on_branch(),
os = os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
)
ci.gpu_builder(
......@@ -3070,7 +3073,6 @@ ci.gpu_builder(
category = "Windows",
),
os = os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
tree_closing = False,
)
......@@ -3170,13 +3172,12 @@ ci.gpu_fyi_linux_builder(
),
)
ci.gpu_fyi_linux_builder(
ci.gpu_fyi_thin_tester(
name = "Android FYI 64 Perf (Pixel 2)",
console_view_entry = ci.console_view_entry(
category = "Android|Perf|Q64",
short_name = "P2",
),
cores = 2,
triggered_by = ["GPU FYI Perf Android 64 Builder"],
)
......
......@@ -306,6 +306,7 @@ ci.dawn_builder(
category = "DEPS|Linux|Builder",
short_name = "x64",
),
pool = "luci.chromium.gpu.ci",
)
ci.dawn_builder(
......@@ -466,6 +467,7 @@ ci.gpu_builder(
),
cores = None,
os = os.MAC_ANY,
pool = "luci.chromium.ci",
)
ci.gpu_builder(
......@@ -475,7 +477,6 @@ ci.gpu_builder(
category = "Windows",
),
os = os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
)
ci.gpu_thin_tester(
......
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