Shuffle jobs off Nexus5x.

All Golo devices except 2 are AWOL. We added 6 to the Skolo, but they
can't keep up.

This CL moves the following jobs off Nexus5x:
 - All ASAN jobs to Pixel. Most other devices we have can't be rooted,
   so they can't run ASAN.
 - Vulkan NoGPUThreads arm64 jobs to NVIDIA_Shield. Of the devices that
   support Vulkan, this has the most available capacity.
    - I removed the arm32 Vulkan NoGPUThreads jobs because it seems a
      bit esoteric.
    - Also removed arm32 Vulkan Debug Perf because I can't imagine it
      would ever give us info that arm64 doesn't already provide. (We
      ignore Perf data from Debug builds.)
    - Other arm32 Vulkan jobs stayed on Nexus5x because we don't have
      any other Vulkan-capable devices with spare capacity.
 - Most arm32 jobs to MotoG4 and de-duplicated. This device has an
   ARMv8 processor but runs everything in arm32 mode, which is exactly
   what these jobs are trying to test. We have a bunch of MotoG4s in
   the Skolo; however, they don't support Vulkan or ASAN.
 - NoGPUThreads and NativeFonts arm64 jobs to GalaxyS6. There are only
   6 in the Skolo, but for some reason these devices are particularly
   fast. They also don't support Vulkan or ASAN.
    - Currently GalaxyS6 CPU arm64 jobs fail, possibly due to OOM. I
      will try to move those jobs in a future CL.

Sorted jobs.json.

Change-Id: If02584a9c04906f4b9c31b4ba3f1da0289a5b8a9
Reviewed-on: https://skia-review.googlesource.com/141281
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>

1 files changed, 26 insertions, 34 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 980d748863..cec6da2652 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -120,36 +120,32 @@
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android",
   "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android",
   "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android",
+  "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android_NoGPUThreads",
   "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android",
   "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan",
   "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android",
   "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan",
+  "Perf-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Debug-All-Android",
+  "Perf-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android",
   "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android",
   "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android",
+  "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android_NoGPUThreads",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan",
+  "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan_NoGPUThreads",
   "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
   "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
   "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android",
   "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android",
-  "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android",
-  "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android",
   "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android",
   "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan",
-  "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads",
   "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android",
   "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
   "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android",
@@ -224,8 +220,8 @@
   "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All",
   "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan",
   "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All",
-  "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan",
   "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer",
+  "Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan",
   "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All",
   "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN",
   "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
@@ -259,8 +255,8 @@
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench",
-  "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9",
+  "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9",
   "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All",
   "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All",
@@ -323,50 +319,40 @@
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android",
+  "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android_NoGPUThreads",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android",
+  "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android_NativeFonts",
+  "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android_NoGPUThreads",
   "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android",
   "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan",
   "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android",
   "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan",
+  "Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Debug-All-Android",
+  "Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Debug-All-Android_NativeFonts",
+  "Test-Android-Clang-MotoG4-CPU-Snapdragon617-arm-Release-All-Android",
   "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android",
+  "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android_NoGPUThreads",
   "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android",
+  "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android_NoGPUThreads",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan",
+  "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan_NoGPUThreads",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan",
+  "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan_NoGPUThreads",
   "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
   "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
   "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android",
   "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android",
-  "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android",
-  "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android_NativeFonts",
-  "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android",
-  "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN",
   "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android",
   "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android",
-  "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android_ASAN",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan",
-  "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads",
   "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android",
   "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
   "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android",
@@ -377,17 +363,23 @@
   "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan",
   "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android",
   "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan",
+  "Test-Android-Clang-Pixel-CPU-Snapdragon821-arm-Release-All-Android_ASAN",
+  "Test-Android-Clang-Pixel-CPU-Snapdragon821-arm64-Release-All-Android_ASAN",
+  "Test-Android-Clang-Pixel-GPU-Adreno530-arm-Release-All-Android_ASAN",
+  "Test-Android-Clang-Pixel-GPU-Adreno530-arm-Release-All-Android_ASAN_Vulkan",
   "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android",
   "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR",
   "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan",
   "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android",
+  "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ASAN",
+  "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ASAN_Vulkan",
   "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan",
   "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android",
+  "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan",
+  "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan",
   "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan",
   "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android",
   "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan",
-  "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan",
-  "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan",
   "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All",
   "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All",
   "Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All",
@@ -449,8 +441,8 @@
   "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer",
   "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
   "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All",
-  "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan",
   "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer",
+  "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan",
   "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All",
   "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All",