ANGLE -> Clang
Switch all ANGLE bots to build with Clang, sort, and dedup.
And remove -x86- ANGLE builders... there's no good reason to have
builders for this config unless we're going to Test/Perf it.
Bug: skia:7377
Change-Id: I1daf8ffa98e098274a4de0ff2c40a4a7e958b211
Reviewed-on: https://skia-review.googlesource.com/80740
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index ff3054e..407086a 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -25,6 +25,7 @@
"Build-Debian9-Clang-x86_64-Debug-Vulkan",
"Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage",
"Build-Debian9-Clang-x86_64-Release",
+ "Build-Debian9-Clang-x86_64-Release-ANGLE",
"Build-Debian9-Clang-x86_64-Release-ASAN",
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Release-Fast",
@@ -43,7 +44,6 @@
"Build-Debian9-GCC-x86_64-Debug",
"Build-Debian9-GCC-x86_64-Debug-NoGPU",
"Build-Debian9-GCC-x86_64-Release",
- "Build-Debian9-GCC-x86_64-Release-ANGLE",
"Build-Debian9-GCC-x86_64-Release-Flutter_Android",
"Build-Debian9-GCC-x86_64-Release-NoGPU",
"Build-Debian9-GCC-x86_64-Release-PDFium",
@@ -70,15 +70,11 @@
"Build-Win-Clang-x86_64-Release-ANGLE",
"Build-Win-Clang-x86_64-Release-Vulkan",
"Build-Win-MSVC-x86-Debug",
- "Build-Win-MSVC-x86-Debug-ANGLE",
"Build-Win-MSVC-x86-Debug-Exceptions",
"Build-Win-MSVC-x86-Release",
- "Build-Win-MSVC-x86-Release-ANGLE",
"Build-Win-MSVC-x86_64-Debug",
- "Build-Win-MSVC-x86_64-Debug-ANGLE",
"Build-Win-MSVC-x86_64-Debug-Vulkan",
"Build-Win-MSVC-x86_64-Release",
- "Build-Win-MSVC-x86_64-Release-ANGLE",
"Build-Win-MSVC-x86_64-Release-Vulkan",
"Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All",
"Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
@@ -143,12 +139,12 @@
"Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All",
"Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All",
"Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All",
+ "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All",
+ "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All",
"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All",
"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All",
"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All",
"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All",
- "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All",
- "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All",
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All",
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All",
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All",
@@ -249,10 +245,8 @@
"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-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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -320,12 +314,12 @@
"Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All",
"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All",
"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All",
+ "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All",
+ "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All",
"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All",
"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All",
"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All",
"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All",
- "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All",
- "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All",
"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All",
"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All",
"Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All",
@@ -336,11 +330,11 @@
"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-All-ASAN_FSAA",
- "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN",
"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-NativeFonts",
"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-Shard_12-Coverage",
@@ -449,10 +443,8 @@
"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-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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",