Add 2 trybots for non-FYI GPU bots and rename GPU.FYI trybots

For consistent naming.
Adding
gpu-try-linux-nvidia-dbg
gpu-try-win10-nvidia-dbg

Also update docs example

TBR=kbr

Bug: 908949
Change-Id: I66111fead635b4a58b7d5b402af776b27019c3d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613674Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660225}

docs/gpu/gpu_testing_bot_details.md

@@ -279,11 +279,11 @@ for the hosts.
         of VMs associated with it. This means that each new bot requires a new
         prefix. Add your new entry to the correct block:
         1. Put waterfall bots under `gpu_ci_bots`. For example: <br>
-           `swarming.gce_provider('linux-fyi-skiarenderer-vulkan-nvidia')` or
-           <br> `swarming.gce_provider('win10-fyi-release-amd-rx-550')`.
+           `gce_thin_trusty('linux-fyi-skiarenderer-vulkan-nvidia', 'us-east1-c')`
+           or <br> `gce_thin_win10('win10-fyi-release-amd-rx-550')`.
         1. Put trybots under the appropriate `gpu_try_bots` block (optional GPU
            trybots, ANGLE trybots, etc.). For example: <br>
-           `swarming.gce_provider('gpu-manual-try-linux-intel-exp')`.
+           `gce_trusty_pair('gpu-fyi-try-linux-intel-exp')`.
 
     1.  Edit [vms.cfg] to add an entry for the new bot. Trybots should be added
         to the `luci.chromium.try` pool; see the configurations of other similar

infra/config/cr-buildbucket.cfg

@@ -3585,59 +3585,59 @@ buckets {
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-l-nexus-5-32"
+      name: "gpu-fyi-try-android-l-nexus-5-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-l-nexus-6-32"
+      name: "gpu-fyi-try-android-l-nexus-6-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-m-nexus-6p-64"
+      name: "gpu-fyi-try-android-m-nexus-6p-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-m-nexus-9-64"
+      name: "gpu-fyi-try-android-m-nexus-9-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-n-nvidia-shield-tv-64"
+      name: "gpu-fyi-try-android-n-nvidia-shield-tv-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-2-32"
+      name: "gpu-fyi-try-android-p-pixel-2-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-2-32-vk"
+      name: "gpu-fyi-try-android-p-pixel-2-32-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-2-32-deqp-vk"
+      name: "gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-2-64-vk"
+      name: "gpu-fyi-try-android-p-pixel-2-64-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-2-64-deqp-vk"
+      name: "gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-xl-32-vk"
+      name: "gpu-fyi-try-android-p-pixel-xl-32-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-xl-32-deqp-vk"
+      name: "gpu-fyi-try-android-p-pixel-xl-32-deqp-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-xl-64-vk"
+      name: "gpu-fyi-try-android-p-pixel-xl-64-vk"
     }
     builders {
       mixins: "android-optional-gpu-try"
-      name: "gpu-manual-try-android-p-pixel-xl-64-deqp-vk"
+      name: "gpu-fyi-try-android-p-pixel-xl-64-deqp-vk"
     }
     builders {
       mixins: "android-try"
@@ -3700,43 +3700,47 @@ buckets {
     builders { mixins: "linux-try" name: "fuchsia-x64-cast" }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-amd-rel"
+      name: "gpu-fyi-try-linux-amd-rel"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-intel-dqp"
+      name: "gpu-fyi-try-linux-intel-dqp"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-intel-exp"
+      name: "gpu-fyi-try-linux-intel-exp"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-intel-ozn"
+      name: "gpu-fyi-try-linux-intel-ozn"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-intel-rel"
+      name: "gpu-fyi-try-linux-intel-rel"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-nvidia-dbg"
+      name: "gpu-fyi-try-linux-nvidia-dbg"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-nvidia-dqp"
+      name: "gpu-fyi-try-linux-nvidia-dqp"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-nvidia-exp"
+      name: "gpu-fyi-try-linux-nvidia-exp"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-nvidia-rel"
+      name: "gpu-fyi-try-linux-nvidia-rel"
     }
     builders {
       mixins: "linux-optional-gpu-try"
-      name: "gpu-manual-try-linux-nvidia-tsn"
+      name: "gpu-fyi-try-linux-nvidia-tsn"
+    }
+    builders {
+      mixins: "linux-optional-gpu-try"
+      name: "gpu-try-linux-nvidia-dbg"
     }
     builders { mixins: "linux-try" name: "leak_detection_linux" }
     builders { mixins: "linux-angle-try" name: "fuchsia-angle-rel" }
@@ -3988,55 +3992,59 @@ buckets {
 
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-amd-dbg"
+      name: "gpu-fyi-try-win7-amd-dbg"
+    }
+    builders {
+      mixins: "win-optional-gpu-try"
+      name: "gpu-fyi-try-win7-amd-dqp"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-amd-dqp"
+      name: "gpu-fyi-try-win7-amd-rel"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-amd-rel"
+      name: "gpu-fyi-try-win7-nvidia-dqp-64"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-nvidia-dqp-64"
+      name: "gpu-fyi-try-win7-nvidia-rel"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-nvidia-rel"
+      name: "gpu-fyi-try-win7-nvidia-rel-64"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win7-nvidia-rel-64"
+      name: "gpu-fyi-try-win10-intel-dqp"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-intel-dqp"
+      name: "gpu-fyi-try-win10-intel-exp"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-intel-exp"
+      name: "gpu-fyi-try-win10-intel-rel"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-intel-rel"
+      name: "gpu-fyi-try-win10-nvidia-dbg"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-nvidia-dbg"
+      name: "gpu-fyi-try-win10-nvidia-dqp"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-nvidia-dqp"
+      name: "gpu-fyi-try-win10-nvidia-exp"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-nvidia-exp"
+      name: "gpu-fyi-try-win10-nvidia-rel"
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-manual-try-win10-nvidia-rel"
+      name: "gpu-try-win10-nvidia-dbg"
     }
     builders { mixins: "win-try" name: "win10_chromium_x64_dbg_ng" }
     builders {

tools/mb/mb_config.pyl

@@ -658,20 +658,20 @@
       'android-deterministic-dbg': 'android_debug_trybot',
       'android-deterministic-rel': 'android_without_codecs_release_trybot_minimal_symbols',
       'cast_shell_android': 'android_cast_debug_static_bot_compile_only',
-      'gpu-manual-try-android-l-nexus-5-32': 'gpu_tests_android_release_trybot',
-      'gpu-manual-try-android-l-nexus-6-32': 'gpu_tests_android_release_trybot',
-      'gpu-manual-try-android-m-nexus-6p-64': 'gpu_tests_android_release_trybot_arm64',
-      'gpu-manual-try-android-m-nexus-9-64': 'gpu_tests_android_release_trybot_arm64',
-      'gpu-manual-try-android-n-nvidia-shield-tv-64': 'gpu_tests_android_release_trybot_arm64',
-      'gpu-manual-try-android-p-pixel-2-32': 'gpu_tests_android_release_trybot',
-      'gpu-manual-try-android-p-pixel-2-32-vk': 'gpu_tests_android_vulkan_release_trybot',
-      'gpu-manual-try-android-p-pixel-2-32-deqp-vk': 'deqp_android_vulkan_release_trybot',
-      'gpu-manual-try-android-p-pixel-2-64-vk': 'gpu_tests_android_vulkan_release_trybot_arm64',
-      'gpu-manual-try-android-p-pixel-2-64-deqp-vk': 'deqp_android_vulkan_release_trybot_arm64',
-      'gpu-manual-try-android-p-pixel-xl-32-vk': 'gpu_tests_android_vulkan_release_trybot',
-      'gpu-manual-try-android-p-pixel-xl-32-deqp-vk': 'deqp_android_vulkan_release_trybot',
-      'gpu-manual-try-android-p-pixel-xl-64-vk': 'gpu_tests_android_vulkan_release_trybot_arm64',
-      'gpu-manual-try-android-p-pixel-xl-64-deqp-vk': 'deqp_android_vulkan_release_trybot_arm64',
+      'gpu-fyi-try-android-l-nexus-5-32': 'gpu_tests_android_release_trybot',
+      'gpu-fyi-try-android-l-nexus-6-32': 'gpu_tests_android_release_trybot',
+      'gpu-fyi-try-android-m-nexus-6p-64': 'gpu_tests_android_release_trybot_arm64',
+      'gpu-fyi-try-android-m-nexus-9-64': 'gpu_tests_android_release_trybot_arm64',
+      'gpu-fyi-try-android-n-nvidia-shield-tv-64': 'gpu_tests_android_release_trybot_arm64',
+      'gpu-fyi-try-android-p-pixel-2-32': 'gpu_tests_android_release_trybot',
+      'gpu-fyi-try-android-p-pixel-2-32-vk': 'gpu_tests_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-p-pixel-2-32-deqp-vk': 'deqp_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-p-pixel-2-64-vk': 'gpu_tests_android_vulkan_release_trybot_arm64',
+      'gpu-fyi-try-android-p-pixel-2-64-deqp-vk': 'deqp_android_vulkan_release_trybot_arm64',
+      'gpu-fyi-try-android-p-pixel-xl-32-vk': 'gpu_tests_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-p-pixel-xl-32-deqp-vk': 'deqp_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-p-pixel-xl-64-vk': 'gpu_tests_android_vulkan_release_trybot_arm64',
+      'gpu-fyi-try-android-p-pixel-xl-64-deqp-vk': 'deqp_android_vulkan_release_trybot_arm64',
       'linux_android_dbg_ng': 'android_debug_trybot',
       'try-nougat-phone-tester': 'android_debug_trybot_arm64',
     },
@@ -731,16 +731,17 @@
       'fuchsia-fyi-x64-rel': 'release_trybot_fuchsia',
       'fuchsia_x64': 'release_trybot_fuchsia',
       'fuchsia-x64-cast': 'release_trybot_fuchsia_cast',
-      'gpu-manual-try-linux-amd-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-linux-intel-dqp': 'deqp_release_trybot',
-      'gpu-manual-try-linux-intel-exp': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-linux-intel-ozn': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
-      'gpu-manual-try-linux-intel-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-linux-nvidia-dbg': 'gpu_fyi_tests_debug_trybot',
-      'gpu-manual-try-linux-nvidia-dqp': 'deqp_release_trybot',
-      'gpu-manual-try-linux-nvidia-exp': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-linux-nvidia-rel': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-linux-nvidia-tsn': 'gpu_fyi_tests_release_trybot_tsan',
+      'gpu-fyi-try-linux-amd-rel': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-linux-intel-dqp': 'deqp_release_trybot',
+      'gpu-fyi-try-linux-intel-exp': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-linux-intel-ozn': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
+      'gpu-fyi-try-linux-intel-rel': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-linux-nvidia-dbg': 'gpu_fyi_tests_debug_trybot',
+      'gpu-fyi-try-linux-nvidia-dqp': 'deqp_release_trybot',
+      'gpu-fyi-try-linux-nvidia-exp': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-linux-nvidia-rel': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-linux-nvidia-tsn': 'gpu_fyi_tests_release_trybot_tsan',
+      'gpu-try-linux-nvidia-dbg': 'gpu_tests_debug_trybot',
       'layout_test_leak_detection': 'release_trybot',
       'leak_detection_linux': 'release_trybot',
       'linux-blink-heap-concurrent-marking-tsan-rel': 'release_trybot_tsan',
@@ -838,19 +839,20 @@
     },
 
     'tryserver.chromium.win': {
-      'gpu-manual-try-win7-amd-dbg': 'gpu_fyi_tests_debug_trybot_x86',
-      'gpu-manual-try-win7-amd-dqp': 'deqp_release_trybot_x86',
-      'gpu-manual-try-win7-amd-rel': 'gpu_fyi_tests_release_trybot_x86',
-      'gpu-manual-try-win7-nvidia-dqp-64': 'deqp_release_trybot',
-      'gpu-manual-try-win7-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
-      'gpu-manual-try-win7-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
-      'gpu-manual-try-win10-intel-dqp': 'deqp_release_trybot_x86',
-      'gpu-manual-try-win10-intel-exp': 'gpu_fyi_tests_release_trybot_x86',
-      'gpu-manual-try-win10-intel-rel': 'gpu_fyi_tests_release_trybot_x86',
-      'gpu-manual-try-win10-nvidia-dbg': 'gpu_fyi_tests_debug_trybot_x86',
-      'gpu-manual-try-win10-nvidia-dqp': 'deqp_release_trybot_x86',
-      'gpu-manual-try-win10-nvidia-exp': 'gpu_fyi_tests_release_trybot_x86',
-      'gpu-manual-try-win10-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win7-amd-dbg': 'gpu_fyi_tests_debug_trybot_x86',
+      'gpu-fyi-try-win7-amd-dqp': 'deqp_release_trybot_x86',
+      'gpu-fyi-try-win7-amd-rel': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win7-nvidia-dqp-64': 'deqp_release_trybot',
+      'gpu-fyi-try-win7-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win7-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
+      'gpu-fyi-try-win10-intel-dqp': 'deqp_release_trybot_x86',
+      'gpu-fyi-try-win10-intel-exp': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win10-intel-rel': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win10-nvidia-dbg': 'gpu_fyi_tests_debug_trybot_x86',
+      'gpu-fyi-try-win10-nvidia-dqp': 'deqp_release_trybot_x86',
+      'gpu-fyi-try-win10-nvidia-exp': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win10-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-try-win10-nvidia-dbg': 'gpu_tests_debug_trybot_x86_minimal_symbols',
       'win7_chromium_rel_loc_exp': 'gpu_tests_release_trybot_x86_minimal_symbols_resource_whitelisting',
       'win10_chromium_x64_dbg_ng': 'gpu_tests_debug_trybot',
       'win10_chromium_x64_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting',