Skip to content

GitLab

T
tangled
Commit cd355888 authored by Yuly Novikov's avatar Yuly Novikov Committed by Commit Bot
Browse files
Options

Switch GPU Windows CI builders to target luci.chromium.gpu.ci pool. 

Including GPU, GPU.FYI, Dawn and SwANGLE builders.

This is 2nd CL out of 3 moving GPU Windows builders GCEs into
luci.chromium.gpu.ci pool.

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

Bug: 1126593
Change-Id: I0cb6a3715865b649cc9ed27179a6c2a66bd0f6ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404389Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806041}
parent 1459f6ae
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 34 deletions
infra/config/generated/cr-buildbucket.cfg
View file @ cd355888
......@@ -1704,7 +1704,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -1733,7 +1733,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -1762,7 +1762,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -1907,7 +1907,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -1936,7 +1936,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2513,7 +2513,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2542,7 +2542,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2571,7 +2571,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2600,7 +2600,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2629,7 +2629,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2658,7 +2658,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2687,7 +2687,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2716,7 +2716,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2745,7 +2745,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2886,7 +2886,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -2915,7 +2915,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -7588,7 +7588,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12051,7 +12051,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12080,7 +12080,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12109,7 +12109,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12138,7 +12138,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12167,7 +12167,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12196,7 +12196,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
......@@ -12225,7 +12225,7 @@ buckets {
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
infra/config/lib/ci.star
View file @ cd355888
......@@ -606,6 +606,14 @@ def dawn_builder(*, name, builderless = True, **kwargs):
**kwargs
)
def dawn_windows_builder(*, name, **kwargs):
return dawn_builder(
name = name,
os = builders.os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
**kwargs
)
def fuzz_builder(*, name, **kwargs):
return ci.builder(
name = name,
......@@ -770,6 +778,7 @@ def gpu_fyi_windows_builder(*, name, **kwargs):
builderless = True,
goma_backend = builders.goma.backend.RBE_PROD,
os = builders.os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
**kwargs
)
......@@ -920,6 +929,7 @@ def swangle_windows_builder(*, name, **kwargs):
name = name,
goma_backend = builders.goma.backend.RBE_PROD,
os = builders.os.WINDOWS_DEFAULT,
pool = "luci.chromium.gpu.ci",
**kwargs
)
......@@ -970,6 +980,7 @@ ci = struct(
clang_builder = clang_builder,
clang_mac_builder = clang_mac_builder,
dawn_builder = dawn_builder,
dawn_windows_builder = dawn_windows_builder,
fuzz_builder = fuzz_builder,
fuzz_libfuzzer_builder = fuzz_libfuzzer_builder,
fyi_builder = fyi_builder,
......
infra/config/subprojects/chromium/ci.star
View file @ cd355888
......@@ -1686,25 +1686,23 @@ ci.dawn_builder(
triggered_by = ["Dawn Mac x64 Builder"],
)
ci.dawn_builder(
ci.dawn_windows_builder(
name = "Dawn Win10 x64 ASAN Release",
console_view_entry = ci.console_view_entry(
category = "ToT|Windows|ASAN",
short_name = "x64",
),
os = os.WINDOWS_ANY,
)
ci.dawn_builder(
ci.dawn_windows_builder(
name = "Dawn Win10 x64 Builder",
console_view_entry = ci.console_view_entry(
category = "ToT|Windows|Builder",
short_name = "x64",
),
os = os.WINDOWS_ANY,
)
ci.dawn_builder(
ci.dawn_windows_builder(
name = "Dawn Win10 x64 DEPS Builder",
branch_selector = branches.STANDARD_RELEASES,
console_view_entry = ci.console_view_entry(
......@@ -1713,7 +1711,6 @@ ci.dawn_builder(
),
cq_mirrors_console_view = settings.cq_mirrors_console_name,
main_console_view = main_console_if_on_branch(),
os = os.WINDOWS_ANY,
)
ci.dawn_builder(
......@@ -1768,16 +1765,15 @@ ci.dawn_builder(
triggered_by = ["Dawn Win10 x64 Builder"],
)
ci.dawn_builder(
ci.dawn_windows_builder(
name = "Dawn Win10 x86 Builder",
console_view_entry = ci.console_view_entry(
category = "ToT|Windows|Builder",
short_name = "x86",
),
os = os.WINDOWS_ANY,
)
ci.dawn_builder(
ci.dawn_windows_builder(
name = "Dawn Win10 x86 DEPS Builder",
branch_selector = branches.STANDARD_RELEASES,
console_view_entry = ci.console_view_entry(
......@@ -1786,7 +1782,6 @@ ci.dawn_builder(
),
cq_mirrors_console_view = settings.cq_mirrors_console_name,
main_console_view = main_console_if_on_branch(),
os = os.WINDOWS_ANY,
)
ci.dawn_builder(
......@@ -3091,6 +3086,7 @@ 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(
......@@ -3100,6 +3096,7 @@ ci.gpu_builder(
category = "Windows",
),
os = os.WINDOWS_ANY,
pool = "luci.chromium.gpu.ci",
tree_closing = 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