Use the updated local Debian 9 bots

Bug: skia:6612
Change-Id: I569eae4643802a5f081da028bc21addeda48679b
Reviewed-on: https://skia-review.googlesource.com/21160
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

3 files changed, 461 insertions, 461 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 06ccb79fcc..4ce0efa8bc 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -284,9 +284,9 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			} else if strings.Contains(parts["os"], "Ubuntu") || strings.Contains(parts["os"], "Debian") {
 				gpu, ok := map[string]string{
 					"GT610":    "10de:104a-340.96",
-					"GTX550Ti": "10de:1244-340.76",
-					"GTX660":   "10de:11c0-367.57",
-					"GTX960":   "10de:1401-367.57",
+					"GTX550Ti": "10de:1244-375.66",
+					"GTX660":   "10de:11c0-375.66",
+					"GTX960":   "10de:1401-375.66",
 					// Intel drivers come from CIPD, so no need to specify the version here.
 					"IntelBayTrail": "8086:0f31",
 					"IntelHD2000":   "8086:0102",
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index c76182dacf..0346797ae3 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -144,6 +144,12 @@
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug",
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+  "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
   "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
   "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
   "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
@@ -153,12 +159,6 @@
   "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
   "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
   "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
-  "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
   "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",
@@ -289,6 +289,13 @@
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release",
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+  "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
   "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
   "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
   "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
@@ -301,13 +308,6 @@
   "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
   "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
   "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
-  "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
   "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",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index de74c5c7c3..eef9da1d03 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -873,94 +873,94 @@
         "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+        "Upload-Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
+        "Upload-Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
+        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
+        "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs"
+        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
+        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
+        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
+        "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
       ]
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
+        "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs"
       ]
     },
     "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
@@ -1743,119 +1743,119 @@
         "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
+        "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+        "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
+        "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
+        "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN"
+        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs"
+        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs"
-      ],
-      "trigger": "weekly"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+      ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
       ]
     },
-    "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
-      ]
+        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs"
+      ],
+      "trigger": "weekly"
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
+        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs"
       ]
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
+        "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext"
       ]
     },
     "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
@@ -6860,7 +6860,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6876,26 +6876,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:10de:1244-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -6903,12 +6907,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
+      "io_timeout_ns": 3600000000000,
       "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6924,26 +6928,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:10de:1244-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -6951,12 +6959,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
+      "io_timeout_ns": 3600000000000,
       "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6975,12 +6983,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Debian9-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:11c0-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6990,7 +6998,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7003,7 +7011,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7022,12 +7030,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:11c0-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7037,7 +7045,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7050,7 +7058,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7069,12 +7077,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-CommandBuffer",
+        "Build-Debian9-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:1401-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7084,7 +7092,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7097,7 +7105,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7113,20 +7121,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-ASAN",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "gpu:10de:1401-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7136,7 +7139,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7149,7 +7152,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7165,20 +7168,16 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-ASAN",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7188,7 +7187,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7201,51 +7200,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7261,30 +7216,26 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244-340.76",
-        "os:Ubuntu-14.04",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7292,12 +7243,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7313,30 +7264,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244-340.76",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7344,12 +7290,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7368,12 +7314,12 @@
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-367.57",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7383,7 +7329,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7396,7 +7342,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7415,12 +7361,12 @@
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Release-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-367.57",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7430,7 +7376,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7443,7 +7389,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7459,14 +7405,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Debug",
+        "Build-Debian9-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -7477,7 +7428,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+        "buildername=Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7490,7 +7441,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7506,14 +7457,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Debian9-Clang-x86_64-Release-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -7524,7 +7480,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -7537,6 +7493,50 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -13024,7 +13024,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13040,26 +13040,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:10de:1244-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13067,12 +13071,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
+      "io_timeout_ns": 3600000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13088,26 +13092,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:10de:1244-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13115,12 +13123,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
+      "io_timeout_ns": 3600000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13136,25 +13144,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:1244-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13162,12 +13175,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
+      "io_timeout_ns": 3600000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13186,12 +13199,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "Build-Debian9-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:11c0-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13201,7 +13214,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13214,7 +13227,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13233,12 +13246,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:10de:11c0-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13248,7 +13261,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13261,7 +13274,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13277,20 +13290,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-ASAN",
+        "Build-Debian9-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "gpu:10de:1401-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13300,7 +13308,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13313,7 +13321,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13329,20 +13337,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-ASAN",
+        "Build-Debian9-GCC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "gpu:10de:1401-375.66",
+        "os:Debian-9.0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13352,7 +13355,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13365,7 +13368,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13381,20 +13384,16 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-TSAN",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13404,7 +13403,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13417,73 +13416,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13502,12 +13435,13 @@
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-340.96",
-        "os:Ubuntu-14.04",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13517,7 +13451,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13530,7 +13464,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13546,30 +13480,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244-340.76",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13577,12 +13506,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13598,30 +13527,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244-340.76",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13629,12 +13553,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+    "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13650,30 +13574,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244-340.76",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13681,12 +13600,12 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13702,14 +13621,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Debug",
+        "Build-Debian9-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13720,7 +13644,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13733,7 +13657,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13749,14 +13673,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
+        "Build-Debian9-Clang-x86_64-Release-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13767,7 +13696,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13780,7 +13709,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13796,14 +13725,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Debian9-GCC-x86_64-Debug",
+        "Build-Debian9-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13814,7 +13748,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13827,7 +13761,73 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13850,7 +13850,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401-367.57",
+        "gpu:10de:104a-340.96",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13861,7 +13861,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18115,9 +18115,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Upload-Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18130,7 +18130,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18142,9 +18142,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Upload-Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+        "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18157,7 +18157,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18169,9 +18169,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
+        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18184,7 +18184,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18196,9 +18196,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18211,7 +18211,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18223,9 +18223,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
       "dependencies": [
-        "Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
+        "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18238,7 +18238,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20680,9 +20680,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20695,7 +20695,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20707,9 +20707,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20722,7 +20722,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20734,9 +20734,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+    "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20749,7 +20749,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20761,9 +20761,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+    "Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
+        "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20776,7 +20776,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20788,9 +20788,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20803,7 +20803,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20815,9 +20815,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20830,7 +20830,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20842,9 +20842,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
+        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20857,7 +20857,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20869,9 +20869,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
       "dependencies": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
+        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20884,7 +20884,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20896,9 +20896,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
+        "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -20911,7 +20911,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",