Make all tasks specify an OS version

Rename Win->Win10 where appropriate

BUG=skia:

Change-Id: I8692340cebf646e2cb0cb825e808b5ea1b695a8f
Reviewed-on: https://skia-review.googlesource.com/5356
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 1c5dacad38e795cdb4f391424a0cbb81b991d2b3..0852dbd14790c9fd9efd5036b83fb8c6e3b4941d 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -148,23 +148,23 @@ var (
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
-               "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-               "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-               "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-               "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-               "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-               "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-               "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-               "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-               "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+               "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+               "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+               "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
                "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
                "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
                "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
                "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+               "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+               "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+               "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+               "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+               "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+               "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+               "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+               "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+               "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+               "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
                "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
                "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
                "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
@@ -233,24 +233,24 @@ var (
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-               "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
-               "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-               "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-               "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-               "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-               "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+               "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+               "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+               "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
                "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
                "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
                "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+               "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+               "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+               "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+               "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+               "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+               "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+               "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
                "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
                "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
                "Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
@@ -320,13 +320,19 @@ func swarmDimensions(parts map[string]string) []string {
                "pool": POOL_SKIA,
        }
        if os, ok := parts["os"]; ok {
-               d["os"] = os
+               d["os"] = map[string]string{
+                       "Android": "Android",
+                       "Mac":     "Mac-10.11",
+                       "Ubuntu":  "Ubuntu-14.04",
+                       "Win":     "Windows-2008ServerR2-SP1",
+                       "Win10":   "Windows-10-10586",
+                       "Win2k8":  "Windows-2008ServerR2-SP1",
+                       "Win8":    "Windows-8.1-SP0",
+                       "iOS":     "iOS-9.3.1",
+               }[os]
        } else {
                d["os"] = DEFAULT_OS
        }
-       if strings.Contains(d["os"], "Win") {
-               d["os"] = "Windows"
-       }
        if parts["role"] == "Test" || parts["role"] == "Perf" {
                if strings.Contains(parts["os"], "Android") {
                        // For Android, the device type is a better dimension
@@ -353,9 +359,6 @@ func swarmDimensions(parts map[string]string) []string {
                        d["device"] = map[string]string{
                                "iPadMini4": "iPad5,1",
                        }[parts["model"]]
-                       // TODO(borenet): Replace this hack with something
-                       // better.
-                       d["os"] = "iOS-9.3.1"
                } else if parts["cpu_or_gpu"] == "CPU" {
                        d["gpu"] = "none"
                        d["cpu"] = map[string]string{

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bd8c915d9a7796da6e023a77526e43c3ac9abc9f..a31741199db3e3727bf07056da628167ba65c1d9 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -752,106 +752,106 @@
         "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
       ]
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
       ]
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ]
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
       ]
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
       ]
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
       ]
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
+        "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
     "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
@@ -1263,112 +1263,112 @@
         "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
+        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
+        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
       ]
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release"
       ]
     },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
       ]
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
       ]
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ]
     },
     "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
@@ -1412,7 +1412,7 @@
     "Build-Mac-Clang-Arm7-Debug-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1437,7 +1437,7 @@
     "Build-Mac-Clang-Arm7-Release-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1469,7 +1469,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1494,7 +1494,7 @@
     "Build-Mac-Clang-arm64-Debug-GN_iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1519,7 +1519,7 @@
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1544,7 +1544,7 @@
     "Build-Mac-Clang-x86_64-Debug-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1569,7 +1569,7 @@
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1594,7 +1594,7 @@
     "Build-Mac-Clang-x86_64-Release-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1626,7 +1626,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1658,7 +1658,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1690,7 +1690,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1722,7 +1722,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1754,7 +1754,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1786,7 +1786,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1818,7 +1818,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1850,7 +1850,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1882,7 +1882,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1914,7 +1914,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1946,7 +1946,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1978,7 +1978,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2010,7 +2010,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2042,7 +2042,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2074,7 +2074,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2106,7 +2106,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2138,7 +2138,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2170,7 +2170,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2202,7 +2202,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2234,7 +2234,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2266,7 +2266,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2298,7 +2298,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2323,7 +2323,7 @@
     "Build-Ubuntu-GCC-x86-Debug": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2348,7 +2348,7 @@
     "Build-Ubuntu-GCC-x86-Release": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2373,7 +2373,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2398,7 +2398,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2423,7 +2423,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2448,7 +2448,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2473,7 +2473,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Fast": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2498,7 +2498,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2523,7 +2523,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Mesa": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2548,7 +2548,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-NoGPU": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2573,7 +2573,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-PDFium": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2598,7 +2598,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2648,7 +2648,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Valgrind": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2680,7 +2680,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2712,7 +2712,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2744,7 +2744,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2776,7 +2776,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2808,7 +2808,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2840,7 +2840,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2872,7 +2872,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2904,7 +2904,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2936,7 +2936,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2968,7 +2968,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3000,7 +3000,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3032,7 +3032,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3069,7 +3069,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3101,7 +3101,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3133,7 +3133,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3165,7 +3165,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3197,7 +3197,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3234,7 +3234,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -5239,7 +5239,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5287,7 +5287,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5336,7 +5336,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5385,7 +5385,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5433,7 +5433,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5481,7 +5481,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5529,7 +5529,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5583,7 +5583,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5632,7 +5632,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5686,7 +5686,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -5735,7 +5735,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5788,7 +5788,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5837,7 +5837,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5886,7 +5886,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5935,7 +5935,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6009,7 +6009,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6082,7 +6082,7 @@
       ],
       "dimensions": [
         "gpu:10de:1244",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -6130,7 +6130,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6178,7 +6178,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6203,7 +6203,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6222,12 +6222,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:104a",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6237,7 +6236,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6252,7 +6251,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6271,12 +6270,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:8086:162b",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6286,7 +6284,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6301,7 +6299,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6320,12 +6318,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:8086:162b",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6335,7 +6332,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6350,7 +6347,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6369,12 +6366,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6384,7 +6380,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6399,7 +6395,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6418,11 +6414,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Windows",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6432,7 +6428,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6447,7 +6443,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6466,11 +6462,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b",
-        "os:Windows",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6480,7 +6476,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6495,7 +6491,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6514,11 +6510,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:162b",
-        "os:Windows",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6528,7 +6524,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6543,7 +6539,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6566,7 +6562,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6576,7 +6572,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6591,7 +6587,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6614,7 +6610,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6624,7 +6620,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6639,7 +6635,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6662,7 +6658,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6672,7 +6668,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6687,7 +6683,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6710,7 +6706,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6720,7 +6716,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6735,7 +6731,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6758,7 +6754,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6768,7 +6764,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6783,7 +6779,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6806,7 +6802,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6816,7 +6812,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6831,7 +6827,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6850,11 +6846,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6864,7 +6861,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6879,7 +6876,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6898,11 +6895,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6912,7 +6910,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6927,7 +6925,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6946,11 +6944,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6960,7 +6959,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6975,7 +6974,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6994,11 +6993,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7008,7 +7008,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7046,7 +7046,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7094,7 +7094,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7142,7 +7142,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7190,7 +7190,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9098,7 +9098,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9146,7 +9146,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9195,7 +9195,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9244,7 +9244,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9292,7 +9292,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9340,7 +9340,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9388,7 +9388,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9442,7 +9442,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9491,7 +9491,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9545,7 +9545,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -9594,7 +9594,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9648,7 +9648,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9701,7 +9701,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9754,7 +9754,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9803,7 +9803,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9927,7 +9927,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9976,7 +9976,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10025,7 +10025,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10074,7 +10074,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10123,7 +10123,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10171,7 +10171,7 @@
       ],
       "dimensions": [
         "gpu:10de:1244",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -10219,7 +10219,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10267,7 +10267,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10292,7 +10292,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10311,12 +10311,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:104a",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10326,7 +10325,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10341,7 +10340,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10360,12 +10359,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:8086:162b",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10375,7 +10373,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10390,7 +10388,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10409,12 +10407,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:8086:162b",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10424,7 +10421,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10439,7 +10436,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10458,12 +10455,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10473,7 +10469,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10488,7 +10484,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10507,12 +10503,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10522,7 +10517,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10537,7 +10532,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10556,12 +10551,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-GDI"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:11c0",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10571,7 +10565,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10586,7 +10580,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10605,11 +10599,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Windows",
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10619,7 +10613,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10634,7 +10628,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10656,8 +10650,8 @@
         "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b",
-        "os:Windows",
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10667,7 +10661,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10682,7 +10676,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10701,11 +10695,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:162b",
-        "os:Windows",
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10715,7 +10709,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10730,7 +10724,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10749,11 +10743,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1401",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10763,7 +10757,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10778,7 +10772,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10797,11 +10791,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10811,7 +10805,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10826,7 +10820,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10848,8 +10842,8 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10859,7 +10853,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10874,7 +10868,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10893,11 +10887,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10907,7 +10902,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10922,7 +10917,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10941,11 +10936,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86-Release"
       ],
       "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10955,7 +10951,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10970,7 +10966,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10989,11 +10985,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11003,7 +11000,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11018,7 +11015,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11037,11 +11034,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11051,7 +11049,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11066,7 +11064,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11085,11 +11083,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11099,7 +11098,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11114,7 +11113,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11133,11 +11132,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Windows",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11147,7 +11147,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11185,7 +11185,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11233,7 +11233,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11281,7 +11281,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11329,7 +11329,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12233,9 +12233,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12248,7 +12248,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12262,9 +12262,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12277,7 +12277,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12291,9 +12291,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12306,7 +12306,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12320,9 +12320,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12335,7 +12335,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12349,9 +12349,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12364,7 +12364,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12378,9 +12378,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12393,7 +12393,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12407,9 +12407,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "dependencies": [
-        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12422,7 +12422,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12436,9 +12436,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
+    "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12451,7 +12451,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14089,9 +14089,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14104,7 +14104,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14118,9 +14118,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
+        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14133,7 +14133,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14147,9 +14147,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14162,7 +14162,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14176,9 +14176,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14191,7 +14191,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14205,9 +14205,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14220,7 +14220,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14234,9 +14234,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
+        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14249,7 +14249,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14263,9 +14263,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14278,7 +14278,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14292,9 +14292,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14307,7 +14307,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14321,9 +14321,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14336,7 +14336,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14350,9 +14350,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14365,7 +14365,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14379,9 +14379,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14394,7 +14394,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14408,9 +14408,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14423,7 +14423,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14437,9 +14437,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14452,7 +14452,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14466,9 +14466,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14481,7 +14481,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14495,9 +14495,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14510,7 +14510,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14524,9 +14524,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "dependencies": [
-        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14539,7 +14539,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14553,9 +14553,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14568,7 +14568,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14582,9 +14582,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
       "dependencies": [
-        "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14597,7 +14597,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",