Switch manual GPU trybots to use builderless pools.

Mac trybots were switched in crrev.com/c/1918372, this completes the
migration, switching Android, Linux and Windows manual GPU trybots.

Also removes gpu-fyi-try-win-xr-builder-64, since it doesn't have a
corresponding pool, and looks like it can't be used for the intended
purpose of pinpoint jobs.

Bug: 1020753, 977735
Change-Id: I7800d10c137010c08bb4ff10cd966dc62df9a161
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015548
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734695}

infra/config/buckets/gpu.try.star

@@ -76,11 +76,172 @@ def try_builder(
 # for specializing on OS: XXX_builder and XXX_YYY_builder where XXX is the part
 # after the last dot in the mastername and YYY is the OS
 
+def gpu_android_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = True,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.android',
+      ssd = None,
+      **kwargs
+  )
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-l-nexus-5-32',
+    pool = 'luci.chromium.gpu.android.nexus5.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-l-nexus-6-32',
+    pool = 'luci.chromium.gpu.android.nexus6.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-m-nexus-5x-64',
+    pool = 'luci.chromium.gpu.android.nexus5x.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-m-nexus-5x-deqp-64',
+    pool = 'luci.chromium.gpu.android.nexus5x.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-m-nexus-5x-skgl-64',
+    pool = 'luci.chromium.gpu.android.nexus5x.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-m-nexus-6p-64',
+    pool = 'luci.chromium.gpu.android.nexus6p.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-m-nexus-9-64',
+    pool = 'luci.chromium.gpu.android.nexus9.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-n-nvidia-shield-tv-64',
+    pool = 'luci.chromium.gpu.android.nvidia.shield.tv.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-p-pixel-2-32',
+    pool = 'luci.chromium.gpu.android.pixel2.chromium.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-p-pixel-2-skv-32',
+    pool = 'luci.chromium.gpu.android.pixel2.chromium.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-q-pixel-2-deqp-vk-32',
+    pool = 'luci.chromium.gpu.android.pixel2.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-q-pixel-2-deqp-vk-64',
+    pool = 'luci.chromium.gpu.android.pixel2.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-q-pixel-2-vk-32',
+    pool = 'luci.chromium.gpu.android.pixel2.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-fyi-try-android-q-pixel-2-vk-64',
+    pool = 'luci.chromium.gpu.android.pixel2.try',
+)
+
+gpu_android_builder(
+    name = 'gpu-try-android-m-nexus-5x-64',
+    pool = 'luci.chromium.gpu.android.nexus5x.try',
+)
+
 
-def gpu_mac_builder(*, name, builderless=True, **kwargs):
+def gpu_linux_builder(*, name, **kwargs):
   return try_builder(
       name = name,
-      builderless = builderless,
+      builderless = True,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.linux',
+      ssd = None,
+      **kwargs
+  )
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-intel-dqp',
+    pool = 'luci.chromium.gpu.linux.intel.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-intel-exp',
+    pool = 'luci.chromium.gpu.linux.intel.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-intel-rel',
+    pool = 'luci.chromium.gpu.linux.intel.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-intel-sk-dawn-rel',
+    pool = 'luci.chromium.gpu.linux.intel.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-intel-skv',
+    pool = 'luci.chromium.gpu.linux.intel.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-dbg',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-dqp',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-exp',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-rel',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-skv',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-fyi-try-linux-nvidia-tsn',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-try-linux-nvidia-dbg',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+gpu_linux_builder(
+    name = 'gpu-try-linux-nvidia-rel',
+    pool = 'luci.chromium.gpu.linux.nvidia.try',
+)
+
+
+def gpu_mac_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = True,
       cores = None,
       goma_backend = goma.backend.RBE_PROD,
       mastername = 'tryserver.chromium.mac',
@@ -170,3 +331,105 @@ gpu_mac_builder(
     pool = 'luci.chromium.gpu.mac.mini.intel.try',
 )
 
+
+def gpu_win_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = True,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.win',
+      os = os.WINDOWS_ANY,
+      ssd = None,
+      **kwargs
+  )
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-intel-dqp-64',
+    pool = 'luci.chromium.gpu.win10.intel.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-intel-exp-64',
+    pool = 'luci.chromium.gpu.win10.intel.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-intel-rel-64',
+    pool = 'luci.chromium.gpu.win10.intel.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-dbg-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-dqp-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-dx12vk-dbg-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-dx12vk-rel-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-exp-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-skgl-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-rel-32',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win10-nvidia-rel-64',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-amd-dbg-32',
+    pool = 'luci.chromium.gpu.win7.amd.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-amd-dqp-32',
+    pool = 'luci.chromium.gpu.win7.amd.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-amd-rel-32',
+    pool = 'luci.chromium.gpu.win7.amd.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-nvidia-dqp-64',
+    pool = 'luci.chromium.gpu.win7.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-nvidia-rel-32',
+    pool = 'luci.chromium.gpu.win7.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-fyi-try-win7-nvidia-rel-64',
+    pool = 'luci.chromium.gpu.win7.nvidia.try',
+)
+
+gpu_win_builder(
+    name = 'gpu-try-win10-nvidia-rel',
+    pool = 'luci.chromium.gpu.win10.nvidia.try',
+)
+

infra/config/buckets/try.star

@@ -677,66 +677,6 @@ gpu_android_builder(
     ),
 )
 
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-l-nexus-5-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-l-nexus-6-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-m-nexus-5x-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-m-nexus-5x-deqp-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-m-nexus-5x-skgl-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-m-nexus-6p-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-m-nexus-9-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-n-nvidia-shield-tv-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-p-pixel-2-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-p-pixel-2-skv-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-q-pixel-2-deqp-vk-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-q-pixel-2-deqp-vk-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-q-pixel-2-vk-32',
-)
-
-gpu_android_builder(
-    name = 'gpu-fyi-try-android-q-pixel-2-vk-64',
-)
-
-gpu_android_builder(
-    name = 'gpu-try-android-m-nexus-5x-64',
-)
-
 
 def gpu_linux_builder(*, name, **kwargs):
   return gpu_builder(
@@ -746,58 +686,6 @@ def gpu_linux_builder(*, name, **kwargs):
       **kwargs
   )
 
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-intel-dqp',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-intel-exp',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-intel-rel',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-intel-sk-dawn-rel',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-intel-skv',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-dbg',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-dqp',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-exp',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-rel',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-skv',
-)
-
-gpu_linux_builder(
-    name = 'gpu-fyi-try-linux-nvidia-tsn',
-)
-
-gpu_linux_builder(
-    name = 'gpu-try-linux-nvidia-dbg',
-)
-
-gpu_linux_builder(
-    name = 'gpu-try-linux-nvidia-rel',
-)
-
 gpu_linux_builder(
     name = 'linux_optional_gpu_tests_rel',
     tryjob = tryjob(
@@ -858,82 +746,6 @@ def gpu_win_builder(*, name, os=os.WINDOWS_ANY, **kwargs):
       **kwargs
   )
 
-gpu_win_builder(
-    name = 'gpu-fyi-try-win-xr-builder-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-intel-dqp-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-intel-exp-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-intel-rel-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-dbg-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-dqp-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-dx12vk-dbg-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-dx12vk-rel-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-exp-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-skgl-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-rel-32',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win10-nvidia-rel-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-amd-dbg-32',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-amd-dqp-32',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-amd-rel-32',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-nvidia-dqp-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-nvidia-rel-32',
-)
-
-gpu_win_builder(
-    name = 'gpu-fyi-try-win7-nvidia-rel-64',
-)
-
-gpu_win_builder(
-    name = 'gpu-try-win10-nvidia-rel',
-)
-
 gpu_win_builder(
     name = 'win_optional_gpu_tests_rel',
     builderless = True,

infra/config/consoles/luci.chromium.try.star

@@ -65,7 +65,6 @@ luci.list_view(
         'try/gpu-fyi-try-linux-nvidia-rel',
         'try/gpu-fyi-try-linux-nvidia-skv',
         'try/gpu-fyi-try-linux-nvidia-tsn',
-        'try/gpu-fyi-try-win-xr-builder-64',
         'try/gpu-fyi-try-win7-amd-dbg-32',
         'try/gpu-fyi-try-win7-amd-dqp-32',
         'try/gpu-fyi-try-win7-amd-rel-32',

infra/config/consoles/tryserver.chromium.win.star

 luci.list_view(
     name = 'tryserver.chromium.win',
     entries = [
-        'try/gpu-fyi-try-win-xr-builder-64',
         'try/gpu-fyi-try-win7-amd-dbg-32',
         'try/gpu-fyi-try-win7-amd-dqp-32',
         'try/gpu-fyi-try-win7-amd-rel-32',

infra/config/generated/commit-queue.cfg

@@ -513,10 +513,6 @@ config_groups: <
         name: "chromium/try/gpu-fyi-try-mac-nvidia-retina-rel"
         includable_only: true
       >
-      builders: <
-        name: "chromium/try/gpu-fyi-try-win-xr-builder-64"
-        includable_only: true
-      >
       builders: <
         name: "chromium/try/gpu-fyi-try-win10-intel-dqp-64"
         includable_only: true

infra/config/generated/luci-milo.cfg

@@ -9984,9 +9984,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-nvidia-tsn"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder-64"
-  >
   builders: <
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg-32"
   >
@@ -12728,9 +12725,6 @@ consoles: <
 consoles: <
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
-  builders: <
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder-64"
-  >
   builders: <
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win7-amd-dbg-32"
   >

tools/mb/mb_config.pyl

@@ -930,7 +930,6 @@
     },
 
     'tryserver.chromium.win': {
-      'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win7-amd-dbg-32': 'gpu_fyi_tests_debug_trybot_x86',
       'gpu-fyi-try-win7-amd-dqp-32': 'deqp_release_trybot_x86',
       'gpu-fyi-try-win7-amd-rel-32': 'gpu_fyi_tests_release_trybot_x86',

tools/mb/mb_config_buckets.pyl

@@ -443,7 +443,6 @@
       'gpu-fyi-try-mac-nvidia-retina-dbg': 'gpu_fyi_tests_debug_trybot',
       'gpu-fyi-try-mac-nvidia-retina-exp': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-dqp-64': 'deqp_release_trybot',
       'gpu-fyi-try-win10-intel-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-rel-64': 'gpu_fyi_tests_release_trybot',
@@ -767,7 +766,6 @@
       'gpu-fyi-try-mac-nvidia-retina-dbg': 'gpu_fyi_tests_debug_trybot',
       'gpu-fyi-try-mac-nvidia-retina-exp': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-dqp-64': 'deqp_release_trybot',
       'gpu-fyi-try-win10-intel-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-rel-64': 'gpu_fyi_tests_release_trybot',
@@ -1111,7 +1109,6 @@
       'gpu-fyi-try-mac-nvidia-retina-dbg': 'gpu_fyi_tests_debug_trybot',
       'gpu-fyi-try-mac-nvidia-retina-exp': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-dqp-64': 'deqp_release_trybot',
       'gpu-fyi-try-win10-intel-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-rel-64': 'gpu_fyi_tests_release_trybot',
@@ -1367,7 +1364,6 @@
       'gpu-fyi-try-mac-nvidia-retina-dbg': 'gpu_fyi_tests_debug_trybot',
       'gpu-fyi-try-mac-nvidia-retina-exp': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-dqp-64': 'deqp_release_trybot',
       'gpu-fyi-try-win10-intel-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-rel-64': 'gpu_fyi_tests_release_trybot',