Move FxAA jobs to Win2016.

Bug: skia:7305
Change-Id: I3cfdb15c11d08143dce66046d66b0ce633277384
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/71862
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Yuqian Li <liyuqian@google.com>

6 files changed, 126 insertions, 126 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index d650e7a1b1..01cc2bd4da 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -464,19 +464,19 @@
   "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",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
-  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
diff --git a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
index fc245b2794..a358e1780f 100644
--- a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
+      "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -214,7 +214,7 @@
       "model",
       "GCE",
       "os",
-      "Win2k8",
+      "Win2016",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
diff --git a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
index cf81376ae0..5b9e47b3fa 100644
--- a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
+      "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -214,7 +214,7 @@
       "model",
       "GCE",
       "os",
-      "Win2k8",
+      "Win2016",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
diff --git a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
index 3073d23478..f17db4e4fa 100644
--- a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
+      "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -214,7 +214,7 @@
       "model",
       "GCE",
       "os",
-      "Win2k8",
+      "Win2016",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 7b1cb0edf2..e52e85a914 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -942,9 +942,9 @@ TEST_BUILDERS = [
   'Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan',
-  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA',
-  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA',
-  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
+  'Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA',
+  'Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA',
+  'Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
   'Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All',
   'Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
   'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 93dfc854d3..c2496c2303 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2801,82 +2801,82 @@
         "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
       ]
     },
-    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
       ]
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
       ]
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
       ]
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ]
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
+        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
+        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
+        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
+        "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
       ]
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ]
     },
     "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
@@ -22174,7 +22174,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22193,7 +22193,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22208,7 +22208,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22221,7 +22221,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22240,7 +22240,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22248,14 +22248,14 @@
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22268,7 +22268,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22287,7 +22287,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22302,7 +22302,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22315,7 +22315,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22334,7 +22334,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22349,7 +22349,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22362,7 +22362,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22381,7 +22381,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22396,7 +22396,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22409,7 +22409,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22428,12 +22428,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22443,7 +22443,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22456,7 +22456,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22475,12 +22475,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22490,7 +22490,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22503,7 +22503,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22522,22 +22522,22 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-MSVC-x86-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22550,7 +22550,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22569,12 +22569,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-MSVC-x86-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22584,7 +22584,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22597,7 +22597,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22616,12 +22616,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22631,7 +22631,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22644,7 +22644,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
+    "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22663,12 +22663,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22678,7 +22678,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22691,7 +22691,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22710,7 +22710,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22725,7 +22725,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22738,7 +22738,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22772,7 +22772,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30331,9 +30331,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
       "dependencies": [
-        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30346,7 +30346,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30358,9 +30358,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
       "dependencies": [
-        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30373,7 +30373,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30385,9 +30385,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
       "dependencies": [
-        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30400,7 +30400,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30412,9 +30412,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30427,7 +30427,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30439,9 +30439,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
       "dependencies": [
-        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30454,7 +30454,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30466,9 +30466,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30481,7 +30481,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30493,9 +30493,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30508,7 +30508,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30520,9 +30520,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
+    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
+        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30535,7 +30535,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30547,9 +30547,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
+    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
+        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30562,7 +30562,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30574,9 +30574,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
+        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30589,7 +30589,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30601,9 +30601,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
+    "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
+        "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30616,7 +30616,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
+        "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30628,9 +30628,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30643,7 +30643,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30655,9 +30655,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30670,7 +30670,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",