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>

2 files changed, 42 insertions, 466 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index ff3054e1f4..407086a7c8 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",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c334c50546..0eba2c7032 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -156,6 +156,12 @@
         "Build-Debian9-Clang-x86_64-Release"
       ]
     },
+    "Build-Debian9-Clang-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Debian9-Clang-x86_64-Release-ANGLE"
+      ]
+    },
     "Build-Debian9-Clang-x86_64-Release-ASAN": {
       "priority": 0.8,
       "tasks": [
@@ -264,12 +270,6 @@
         "Build-Debian9-GCC-x86_64-Release"
       ]
     },
-    "Build-Debian9-GCC-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Debian9-GCC-x86_64-Release-ANGLE"
-      ]
-    },
     "Build-Debian9-GCC-x86_64-Release-Flutter_Android": {
       "priority": 0.8,
       "tasks": [
@@ -431,12 +431,6 @@
         "Build-Win-MSVC-x86-Debug"
       ]
     },
-    "Build-Win-MSVC-x86-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86-Debug-ANGLE"
-      ]
-    },
     "Build-Win-MSVC-x86-Debug-Exceptions": {
       "priority": 0.8,
       "tasks": [
@@ -449,24 +443,12 @@
         "Build-Win-MSVC-x86-Release"
       ]
     },
-    "Build-Win-MSVC-x86-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86-Release-ANGLE"
-      ]
-    },
     "Build-Win-MSVC-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
         "Build-Win-MSVC-x86_64-Debug"
       ]
     },
-    "Build-Win-MSVC-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
-      ]
-    },
     "Build-Win-MSVC-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -479,12 +461,6 @@
         "Build-Win-MSVC-x86_64-Release"
       ]
     },
-    "Build-Win-MSVC-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
-      ]
-    },
     "Build-Win-MSVC-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1509,12 +1485,6 @@
         "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All"
       ]
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
-      ]
-    },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1527,12 +1497,6 @@
         "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
-      ]
-    },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2711,12 +2675,6 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All"
       ]
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
-      ]
-    },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2729,12 +2687,6 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
-      ]
-    },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -3686,6 +3638,36 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Debian9-Clang-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:10"
+        }
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "compile",
+        "repository=<(REPO)",
+        "buildername=Build-Debian9-Clang-x86_64-Release-ANGLE",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Debian9-Clang-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
@@ -4211,29 +4193,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Debian9-GCC-x86_64-Release-ANGLE": {
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Debian9-GCC-x86_64-Release-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Debian9-GCC-x86_64-Release-Flutter_Android": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
@@ -4914,32 +4873,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86-Debug-ANGLE": {
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateWinToolchain"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86-Debug-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86-Debug-Exceptions": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateWinToolchain"
@@ -4992,32 +4925,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86-Release-ANGLE": {
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateWinToolchain"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86-Release-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86_64-Debug": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateWinToolchain"
@@ -5044,32 +4951,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86_64-Debug-ANGLE": {
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateWinToolchain"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86_64-Debug-Vulkan": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateWinToolchain",
@@ -5123,32 +5004,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateWinToolchain"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86_64-Release-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86_64-Release-Vulkan": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateWinToolchain",
@@ -12197,53 +12052,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:33"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:100"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
@@ -12338,53 +12146,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:33"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:100"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
@@ -21539,54 +21300,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:33"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:100"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
@@ -21683,54 +21396,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:33"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:100"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
@@ -25268,33 +24933,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "dependencies": [
-        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
         "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
@@ -29704,33 +29342,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
-      "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "dependencies": [
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
@@ -29785,33 +29396,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
-      "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"