Switch GPU CI testers to target luci.chromium.gpu.ci pool

Including GPU, GPU.FYI and Dawn testers for trunk and M85.
Also includes some small changes for consistency:
- Don't specify GOMA backend for testers
- Don't specify cores dimension on Mac (some are 4 and some 8 core)

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

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

Bug: 1132439
Change-Id: I385b625271b510816e322b0aa93e317634c59c88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434087Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811799}

infra/config/lib/ci.star

@@ -598,20 +598,58 @@ def clang_mac_builder(*, name, cores = 24, **kwargs):
         **kwargs
     )
 
-def dawn_builder(*, name, builderless = True, **kwargs):
+def dawn_builder(*, name, **kwargs):
     return ci.builder(
         name = name,
         builder_group = "chromium.dawn",
-        builderless = builderless,
-        goma_backend = builders.goma.backend.RBE_PROD,
         service_account =
             "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com",
         **kwargs
     )
 
+def dawn_linux_builder(
+        *,
+        name,
+        goma_backend = builders.goma.backend.RBE_PROD,
+        **kwargs):
+    return dawn_builder(
+        name = name,
+        builderless = True,
+        goma_backend = goma_backend,
+        os = builders.os.LINUX_DEFAULT,
+        pool = "luci.chromium.gpu.ci",
+        **kwargs
+    )
+
+def dawn_mac_builder(*, name, **kwargs):
+    return dawn_builder(
+        name = name,
+        builderless = False,
+        cores = None,
+        goma_backend = builders.goma.backend.RBE_PROD,
+        os = builders.os.MAC_ANY,
+        **kwargs
+    )
+
+# Many of the GPU testers are thin testers, they use linux VMS regardless of the
+# actual OS that the tests are built for
+def dawn_thin_tester(
+        *,
+        name,
+        **kwargs):
+    return dawn_linux_builder(
+        name = name,
+        cores = 2,
+        # Setting goma_backend for testers is a no-op, but better to be explicit
+        goma_backend = None,
+        **kwargs
+    )
+
 def dawn_windows_builder(*, name, **kwargs):
     return dawn_builder(
         name = name,
+        builderless = True,
+        goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.WINDOWS_ANY,
         pool = "luci.chromium.gpu.ci",
         **kwargs
@@ -745,20 +783,21 @@ 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,
+        os = builders.os.LINUX_DEFAULT,
+        pool = "luci.chromium.gpu.ci",
         **kwargs
     )
 
-def gpu_fyi_mac_builder(*, name, cores = 4, **kwargs):
+def gpu_fyi_mac_builder(*, name, **kwargs):
     return gpu_fyi_builder(
         name = name,
-        cores = cores,
+        builderless = False,
+        cores = None,
         execution_timeout = 6 * time.hour,
         goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.MAC_ANY,
@@ -779,7 +818,6 @@ 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
     )
 
@@ -793,28 +831,60 @@ def gpu_fyi_windows_builder(*, name, **kwargs):
         **kwargs
     )
 
-def gpu_builder(*, name, tree_closing = True, notifies = None, pool = "luci.chromium.gpu.ci", **kwargs):
+def gpu_builder(*, name, tree_closing = True, notifies = None, **kwargs):
     if tree_closing:
         notifies = (notifies or []) + ["gpu-tree-closer-email"]
     return ci.builder(
         name = name,
         builder_group = "chromium.gpu",
-        goma_backend = builders.goma.backend.RBE_PROD,
         tree_closing = tree_closing,
         notifies = notifies,
-        pool = pool,
+        **kwargs
+    )
+
+def gpu_linux_builder(
+        *,
+        name,
+        goma_backend = builders.goma.backend.RBE_PROD,
+        **kwargs):
+    return gpu_builder(
+        name = name,
+        builderless = True,
+        goma_backend = goma_backend,
+        os = builders.os.LINUX_DEFAULT,
+        pool = "luci.chromium.gpu.ci",
+        **kwargs
+    )
+
+def gpu_mac_builder(*, name, **kwargs):
+    return gpu_builder(
+        name = name,
+        builderless = False,
+        cores = None,
+        goma_backend = builders.goma.backend.RBE_PROD,
+        os = builders.os.MAC_ANY,
         **kwargs
     )
 
 # Many of the GPU testers are thin testers, they use linux VMS regardless of the
 # actual OS that the tests are built for
 def gpu_thin_tester(*, name, tree_closing = True, **kwargs):
-    return gpu_builder(
+    return gpu_linux_builder(
         name = name,
         cores = 2,
-        os = builders.os.LINUX_DEFAULT,
         tree_closing = tree_closing,
-        pool = "luci.chromium.ci",
+        # Setting goma_backend for testers is a no-op, but better to be explicit
+        goma_backend = None,
+        **kwargs
+    )
+
+def gpu_windows_builder(*, name, **kwargs):
+    return gpu_builder(
+        name = name,
+        builderless = True,
+        goma_backend = builders.goma.backend.RBE_PROD,
+        os = builders.os.WINDOWS_ANY,
+        pool = "luci.chromium.gpu.ci",
         **kwargs
     )
 
@@ -944,7 +1014,7 @@ def swangle_mac_builder(
     return swangle_builder(
         name = name,
         builderless = False,
-        cores = 4,
+        cores = None,
         goma_backend = builders.goma.backend.RBE_PROD,
         os = builders.os.MAC_ANY,
         **kwargs
@@ -1005,7 +1075,9 @@ ci = struct(
     chromiumos_builder = chromiumos_builder,
     clang_builder = clang_builder,
     clang_mac_builder = clang_mac_builder,
-    dawn_builder = dawn_builder,
+    dawn_linux_builder = dawn_linux_builder,
+    dawn_mac_builder = dawn_mac_builder,
+    dawn_thin_tester = dawn_thin_tester,
     dawn_windows_builder = dawn_windows_builder,
     fuzz_builder = fuzz_builder,
     fuzz_libfuzzer_builder = fuzz_libfuzzer_builder,
@@ -1019,8 +1091,10 @@ ci = struct(
     gpu_fyi_mac_builder = gpu_fyi_mac_builder,
     gpu_fyi_thin_tester = gpu_fyi_thin_tester,
     gpu_fyi_windows_builder = gpu_fyi_windows_builder,
-    gpu_builder = gpu_builder,
+    gpu_linux_builder = gpu_linux_builder,
+    gpu_mac_builder = gpu_mac_builder,
     gpu_thin_tester = gpu_thin_tester,
+    gpu_windows_builder = gpu_windows_builder,
     linux_builder = linux_builder,
     mac_builder = mac_builder,
     mac_ios_builder = mac_ios_builder,

infra/config/subprojects/chromium/versioned/m85/buckets/ci.star

@@ -300,69 +300,57 @@ ci.chromiumos_builder(
     ),
 )
 
-ci.dawn_builder(
+ci.dawn_linux_builder(
     name = "Dawn Linux x64 DEPS Builder",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Builder",
         short_name = "x64",
     ),
-    pool = "luci.chromium.gpu.ci",
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Linux x64 DEPS Release (Intel HD 630)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Intel",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Linux x64 DEPS Release (NVIDIA)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Linux|Nvidia",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Linux x64 DEPS Builder")],
 )
 
-ci.dawn_builder(
+ci.dawn_mac_builder(
     name = "Dawn Mac x64 DEPS Builder",
-    builderless = False,
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|Builder",
         short_name = "x64",
     ),
-    cores = None,
-    os = os.MAC_ANY,
 )
 
 # Note that the Mac testers are all thin Linux VMs, triggering jobs on the
 # physical Mac hardware in the Swarming pool which is why they run on linux
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Mac x64 DEPS Release (AMD)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|AMD",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Mac x64 DEPS Release (Intel)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Mac|Intel",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Mac x64 DEPS Builder")],
 )
 
@@ -374,25 +362,21 @@ ci.dawn_windows_builder(
     ),
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Win10 x64 DEPS Release (Intel HD 630)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Win10 x64 DEPS Release (NVIDIA)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x64",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Win10 x64 DEPS Builder")],
 )
 
@@ -404,25 +388,21 @@ ci.dawn_windows_builder(
     ),
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Win10 x86 DEPS Release (Intel HD 630)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Intel",
         short_name = "x86",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
 )
 
-ci.dawn_builder(
+ci.dawn_thin_tester(
     name = "Dawn Win10 x86 DEPS Release (NVIDIA)",
     console_view_entry = ci.console_view_entry(
         category = "DEPS|Windows|Nvidia",
         short_name = "x86",
     ),
-    cores = 2,
-    os = os.LINUX_DEFAULT,
     triggered_by = [builder_name("Dawn Win10 x86 DEPS Builder")],
 )
 
@@ -446,37 +426,32 @@ ci.fyi_ios_builder(
     },
 )
 
-ci.gpu_builder(
+ci.gpu_linux_builder(
     name = "Android Release (Nexus 5X)",
     console_view_entry = ci.console_view_entry(
         category = "Android",
     ),
 )
 
-ci.gpu_builder(
+ci.gpu_linux_builder(
     name = "GPU Linux Builder",
     console_view_entry = ci.console_view_entry(
         category = "Linux",
     ),
 )
 
-ci.gpu_builder(
+ci.gpu_mac_builder(
     name = "GPU Mac Builder",
     console_view_entry = ci.console_view_entry(
         category = "Mac",
     ),
-    cores = None,
-    os = os.MAC_ANY,
-    pool = "luci.chromium.ci",
 )
 
-ci.gpu_builder(
+ci.gpu_windows_builder(
     name = "GPU Win x64 Builder",
-    builderless = True,
     console_view_entry = ci.console_view_entry(
         category = "Windows",
     ),
-    os = os.WINDOWS_ANY,
 )
 
 ci.gpu_thin_tester(