Rename Pixel 2 Vulkan GPU bots.

Reflecting Android Q OS upgrade.

TBR=kbr

Bug: angleproject:3340
Change-Id: I7a246fdd4a68a06ae226200c96adb23397ccd381
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715905Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680158}

infra/config/cr-buildbucket.cfg

@@ -3823,27 +3823,27 @@ buckets {
     builders {
       mixins: "android-optional-gpu-try"
       mixins: "goma-rbe-prod"
-      name: "gpu-fyi-try-android-p-pixel-2-32-vk"
+      name: "gpu-fyi-try-android-p-pixel-2-skv-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
       mixins: "goma-rbe-prod"
-      name: "gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
       mixins: "goma-rbe-prod"
-      name: "gpu-fyi-try-android-p-pixel-2-64-vk"
+      name: "gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
     }
     builders {
       mixins: "android-optional-gpu-try"
       mixins: "goma-rbe-prod"
-      name: "gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+      name: "gpu-fyi-try-android-q-pixel-2-vk-32"
     }
     builders {
       mixins: "android-optional-gpu-try"
       mixins: "goma-rbe-prod"
-      name: "gpu-fyi-try-android-p-pixel-2-skv-32"
+      name: "gpu-fyi-try-android-q-pixel-2-vk-64"
     }
     builders {
       mixins: "android-try"

infra/config/luci-milo.cfg

@@ -4092,19 +4092,19 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/android-deterministic-rel"
@@ -4777,19 +4777,19 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-32-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-deqp-vk-64"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-64-deqp-vk"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-32"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-p-pixel-2-skv-32"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-q-pixel-2-vk-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-linux-intel-dqp"

tools/mb/mb_config.pyl

@@ -662,11 +662,11 @@
       '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-2-skv-32': 'gpu_tests_android_release_trybot',
+      'gpu-fyi-try-android-q-pixel-2-deqp-vk-32': 'deqp_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-q-pixel-2-deqp-vk-64': 'deqp_android_vulkan_release_trybot_arm64',
+      'gpu-fyi-try-android-q-pixel-2-vk-32': 'gpu_tests_android_vulkan_release_trybot',
+      'gpu-fyi-try-android-q-pixel-2-vk-64': 'gpu_tests_android_vulkan_release_trybot_arm64',
       'linux_android_dbg_ng': 'android_debug_trybot',
       'try-nougat-phone-tester': 'android_debug_trybot_arm64',
       'android-oreo-arm64-dbg': 'android_debug_trybot_arm64',