Move most remaining ANGLE bots to Clang.

Sort job names.

Docs-Preview: https://skia.org/?cl=63080
No-Try: true
Change-Id: Ia72c055c4ddb903063b8a4be5ebd6ba92fc8b6d6
Reviewed-on: https://skia-review.googlesource.com/63080
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

1 files changed, 33 insertions, 33 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index a7600ec026..b159f884d8 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -89,6 +89,7 @@
   "Build-Win-MSVC-x86_64-Release",
   "Build-Win-MSVC-x86_64-Release-ANGLE",
   "Build-Win-MSVC-x86_64-Release-Vulkan",
+  "Calmbench-Debian9-Clang-x86_64-Release",
   "Housekeeper-Nightly-RecreateSKPs_Canary",
   "Housekeeper-Nightly-UpdateMetaConfig",
   "Housekeeper-PerCommit",
@@ -133,13 +134,13 @@
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android",
+  "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan",
   "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-All-Android",
   "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-All-Android",
+  "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench",
   "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench",
-  "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
-  "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug-All",
   "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release-All",
   "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug-All",
@@ -207,8 +208,10 @@
   "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41",
   "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All",
+  "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+  "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
@@ -217,12 +220,18 @@
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
   "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-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+  "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+  "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+  "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+  "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+  "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
@@ -230,29 +239,21 @@
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+  "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+  "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+  "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+  "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
-  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
-  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -330,17 +331,17 @@
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FDAA",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_16-Coverage",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FDAA",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_16-Coverage",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast",
@@ -399,8 +400,10 @@
   "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41",
   "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All",
+  "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+  "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
   "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
@@ -410,41 +413,39 @@
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+  "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+  "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+  "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+  "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+  "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+  "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+  "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
-  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
-  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -458,13 +459,13 @@
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
+  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
+  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",
@@ -476,6 +477,5 @@
   "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All",
   "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All",
   "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All",
-  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All",
-  "Calmbench-Debian9-Clang-x86_64-Release"
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All"
 ]