Rename remaining NUCs.

Detailed naming introduced in https://skia-review.googlesource.com/c/8805/, https://skia-review.googlesource.com/c/9229/, and https://skia-review.googlesource.com/c/9483/.

NOTRY=true

Change-Id: I6f324c76e2ac8ddc2bb5d623b6d84530fda57774
Reviewed-on: https://skia-review.googlesource.com/9650
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 267 insertions, 267 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 9ff7566dbb..6c8535b2c5 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -135,12 +135,12 @@
   "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
   "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
-  "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
-  "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
-  "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+  "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+  "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+  "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+  "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
   "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
   "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
@@ -150,14 +150,14 @@
   "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
   "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-  "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
@@ -255,12 +255,12 @@
   "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
   "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
-  "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
-  "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
-  "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
   "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+  "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+  "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+  "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+  "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
   "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
@@ -270,14 +270,14 @@
   "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
   "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-  "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 2fcfa60ee0..1b64a5f0b6 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -818,40 +818,40 @@
         "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+        "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
+        "Upload-Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
+        "Upload-Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
     "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
@@ -908,52 +908,52 @@
         "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE"
+        "Upload-Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
     "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
@@ -1539,40 +1539,40 @@
         "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+        "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
+        "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
+        "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
     "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
@@ -1629,52 +1629,52 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE"
+        "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
     "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
@@ -7152,7 +7152,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7179,7 +7179,7 @@
         "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:22b1",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -7190,7 +7190,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7206,7 +7206,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7224,21 +7224,16 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:0"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:22b1",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -7249,7 +7244,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7265,7 +7260,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7283,13 +7278,13 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7303,7 +7298,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7319,7 +7314,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7342,13 +7337,13 @@
           "version": "version:0"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7362,7 +7357,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7378,7 +7373,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7396,16 +7391,16 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:1926",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -7416,7 +7411,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7432,7 +7427,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7450,16 +7445,21 @@
           "version": "version:4"
         },
         {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:0"
+        },
+        {
           "name": "skia/bots/linux_vulkan_intel_driver_release",
           "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:1926",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -7470,7 +7470,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7937,7 +7937,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7956,10 +7956,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7970,7 +7970,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7986,7 +7986,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8005,10 +8005,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -8019,7 +8019,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8035,7 +8035,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8054,7 +8054,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8068,7 +8068,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8084,7 +8084,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8103,7 +8103,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8117,7 +8117,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8133,7 +8133,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8152,7 +8152,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8166,7 +8166,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8182,7 +8182,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8201,7 +8201,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8215,7 +8215,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8231,7 +8231,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8250,10 +8250,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -8264,7 +8264,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8280,7 +8280,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8299,10 +8299,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -8313,7 +8313,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13110,7 +13110,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13137,7 +13137,7 @@
         "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:22b1",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -13148,7 +13148,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13164,7 +13164,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13182,21 +13182,16 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:0"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:22b1",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -13207,7 +13202,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13223,7 +13218,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13241,13 +13236,13 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13261,7 +13256,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13277,7 +13272,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13300,13 +13295,13 @@
           "version": "version:0"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13320,7 +13315,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13336,7 +13331,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13354,16 +13349,16 @@
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:1926",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -13374,7 +13369,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13390,7 +13385,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13408,16 +13403,21 @@
           "version": "version:4"
         },
         {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:0"
+        },
+        {
           "name": "skia/bots/linux_vulkan_intel_driver_release",
           "path": "linux_vulkan_intel_driver_release",
           "version": "version:2"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:1926",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -13428,7 +13428,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13895,7 +13895,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13914,10 +13914,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -13928,7 +13928,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13944,7 +13944,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13963,10 +13963,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -13977,7 +13977,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13993,7 +13993,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14012,7 +14012,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14026,7 +14026,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14042,7 +14042,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14061,7 +14061,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14075,7 +14075,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14091,7 +14091,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14110,7 +14110,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14124,7 +14124,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14140,7 +14140,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14159,7 +14159,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14173,7 +14173,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14189,7 +14189,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14208,10 +14208,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -14222,7 +14222,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14238,7 +14238,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14257,10 +14257,10 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -14271,7 +14271,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16462,9 +16462,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16477,7 +16477,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16492,9 +16492,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Upload-Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16507,7 +16507,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16522,9 +16522,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Upload-Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
+        "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16537,7 +16537,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16702,9 +16702,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release"
+        "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16717,7 +16717,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16732,9 +16732,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16747,7 +16747,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16762,9 +16762,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16777,7 +16777,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -16792,9 +16792,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -16807,7 +16807,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -18922,9 +18922,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18937,7 +18937,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -18952,9 +18952,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18967,7 +18967,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -18982,9 +18982,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+        "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18997,7 +18997,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19012,9 +19012,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19027,7 +19027,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19042,9 +19042,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
+        "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19057,7 +19057,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19072,9 +19072,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Upload-Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
+        "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19087,7 +19087,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19372,9 +19372,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug"
+        "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19387,7 +19387,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19402,9 +19402,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE"
+        "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19417,7 +19417,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19432,9 +19432,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19447,7 +19447,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19462,9 +19462,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19477,7 +19477,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19492,9 +19492,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19507,7 +19507,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19522,9 +19522,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19537,7 +19537,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19552,9 +19552,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19567,7 +19567,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -19582,9 +19582,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
+        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -19597,7 +19597,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",