Revert "Add Win x86 Clang Perf/Test jobs."

This reverts commit 40091fd4fc453eb514bf7ca903326fa3538ab6c9.

Reason for revert: Need to revert dependency https://skia-review.googlesource.com/c/skia/+/114093

Original change's description:
> Add Win x86 Clang Perf/Test jobs.
> 
> Also switch CQ Win 32-bit Build from MSVC to Clang.
> 
> No-Try: true
> Change-Id: Ic312ee611b1e99143480840c08a9266a4d8b448b
> Reviewed-on: https://skia-review.googlesource.com/113672
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,benjaminwagner@google.com

Change-Id: I6a13e97df461bd61eac92bbc3c498146b5322a4a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/114421
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

3 files changed, 1 insertions, 658 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 371ccf6955..04f82d3451 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -279,7 +279,6 @@
   "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-Vulkan",
-  "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -289,10 +288,8 @@
   "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
-  "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
   "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Perf-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
-  "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
   "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All",
@@ -509,8 +506,6 @@
   "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-Vulkan",
-  "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
-  "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
@@ -527,16 +522,12 @@
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
-  "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
-  "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
-  "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
-  "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 4c02b13062..96e158b848 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1692,12 +1692,6 @@
         "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
-    "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
-      ]
-    },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -1752,12 +1746,6 @@
         "Upload-Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
-    "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ]
-    },
     "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -1770,12 +1758,6 @@
         "Perf-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"
       ]
     },
-    "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ]
-    },
     "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3076,18 +3058,6 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
-    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
-      ]
-    },
-    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All"
-      ]
-    },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3184,18 +3154,6 @@
         "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ]
-    },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All"
-      ]
-    },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3232,18 +3190,6 @@
         "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All"
       ]
     },
-    "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ]
-    },
-    "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All"
-      ]
-    },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -13690,54 +13636,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
-        "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -14168,53 +14066,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-7-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -14309,53 +14160,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-8.1-SP0",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -24171,104 +23975,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
-        "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-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
-        "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -25051,102 +24757,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-7-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-7-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
-        "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -25435,102 +25045,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-8.1-SP0",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 21600000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:34"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:116"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-E5-2670",
-        "os:Windows-8.1-SP0",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
-        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
-        "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-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -33599,60 +33113,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
-      "dependencies": [
-        "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
-        "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-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
-      "dependencies": [
-        "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
-        "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
@@ -34031,60 +33491,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
-        "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All"
@@ -34247,60 +33653,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
-      "dependencies": [
-        "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
-        "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-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
-      "dependencies": [
-        "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
-        "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-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All"
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index 75afe73279..0ecc6d85d1 100644
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -42,8 +42,8 @@ verifiers {
       builders { name: "Build-Debian9-GCC-x86_64-Release" }
       builders { name: "Build-Mac-Clang-x86_64-Debug-Metal" }
       builders { name: "Build-Mac-Clang-x86_64-Release" }
-      builders { name: "Build-Win-Clang-x86-Debug" }
       builders { name: "Build-Win-Clang-x86_64-Release-Vulkan" }
+      builders { name: "Build-Win-MSVC-x86-Debug" }
       builders { name: "Housekeeper-PerCommit-Bookmaker" }
       builders { name: "Housekeeper-PerCommit-InfraTests" }
       builders { name: "Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All" }