Enable ios on Raspberry Pi

Adds more jobs to iOS testing and switches to
RPi based hosts.

Bug: skia:
Change-Id: I0124c6554173fa3b22b077a198612bb30691d1fb
Reviewed-on: https://skia-review.googlesource.com/11521
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index d3f14d4..d14f881 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -173,7 +173,18 @@ func swarmDimensions(parts map[string]string) []string {
                } else if strings.Contains(parts["os"], "iOS") {
                        d["device"] = map[string]string{
                                "iPadMini4": "iPad5,1",
+                               "iPhone6":   "iPhone7,2",
+                               "iPhone7":   "iPhone9,1",
+                               "iPadPro":   "iPad6,3",
                        }[parts["model"]]
+
+                       // TODO(stephana): Remove once we are fully switched to RaspberryPi.
+
+                       // Use the RPi host.
+                       if parts["extra_config"] == "RaspberryPi" {
+                               d["os"] = "iOS-10.3.1"
+                               d["machine_type"] = "RaspberryPi"
+                       }
                } else if parts["cpu_or_gpu"] == "CPU" {
                        d["gpu"] = "none"
                        d["cpu"] = map[string]string{

diff --git a/infra/bots/ios_bin.isolate b/infra/bots/ios_bin.isolate
index 524dad2..1994eb6 100644 (file)
--- a/infra/bots/ios_bin.isolate
+++ b/infra/bots/ios_bin.isolate
@@ -8,5 +8,13 @@
         ],
       },
     }],
+    ['OS=="iOS-10.3.1"', {
+      'variables': {
+        'files': [
+          '../../platform_tools/ios/bin/',
+          '../../gn/package_ios.py',
+        ],
+      },
+    }],
   ],
 }

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 16e3117..23ac2d0 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -210,6 +210,12 @@
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
   "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
   "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
+  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android",
@@ -355,5 +361,11 @@
   "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
   "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
   "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
-  "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release"
+  "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
+  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
 ]

diff --git a/infra/bots/recipe_modules/flavor/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json b/infra/bots/recipe_modules/flavor/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json
index 27640e4..3c7b431 100644 (file)
--- a/infra/bots/recipe_modules/flavor/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json
+++ b/infra/bots/recipe_modules/flavor/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json
@@ -90,6 +90,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file file.txt"
   },
   {
@@ -140,6 +141,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm device_results_dir"
   },
   {
@@ -153,10 +155,54 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir device_results_dir"
   },
   {
     "cmd": [
+      "ios.py"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "setup_device"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Debug/dm.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Debug/nanobench.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_nanobench"
+  },
+  {
+    "cmd": [
       "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
       "[START_DIR]/skia/resources",
       "resources"
@@ -167,6 +213,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skia/resources"
   },
   {
@@ -202,6 +249,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SKP_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -216,6 +264,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SKP_VERSION"
   },
   {
@@ -229,6 +278,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm skps"
   },
   {
@@ -242,6 +292,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir skps"
   },
   {
@@ -256,6 +307,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skp"
   },
   {
@@ -270,6 +322,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SKP_VERSION"
   },
   {
@@ -305,6 +358,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SK_IMAGE_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -319,6 +373,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SK_IMAGE_VERSION"
   },
   {
@@ -332,6 +387,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm images"
   },
   {
@@ -345,6 +401,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir images"
   },
   {
@@ -359,6 +416,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skimage"
   },
   {
@@ -373,6 +431,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
   },
   {
@@ -408,6 +467,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SVG_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -422,6 +482,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SVG_VERSION"
   },
   {
@@ -435,6 +496,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm svgs"
   },
   {
@@ -448,6 +510,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir svgs"
   },
   {
@@ -462,6 +525,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/svg"
   },
   {
@@ -476,14 +540,14 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SVG_VERSION"
   },
   {
     "cmd": [
-      "ios-deploy",
-      "-b",
-      "[START_DIR]/out/Debug/dm.app",
-      "-I",
+      "idevice-app-runner",
+      "-s",
+      "com.google.dm",
       "--args",
       "--some-flag"
     ],
@@ -507,6 +571,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "pull_if_needed dm"
   },
   {
@@ -521,6 +586,7 @@
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "pull_if_needed perf"
   },
   {

diff --git a/infra/bots/recipe_modules/flavor/ios_flavor.py b/infra/bots/recipe_modules/flavor/ios_flavor.py
index 976e840..cc6143a 100644 (file)
--- a/infra/bots/recipe_modules/flavor/ios_flavor.py
+++ b/infra/bots/recipe_modules/flavor/ios_flavor.py
@@ -9,12 +9,21 @@ import default_flavor
 import gn_flavor
 import os
 
-# Infra step failures interact really annoyingly with swarming retries.
-kInfraStep = False
-
 class iOSFlavorUtils(gn_flavor.GNFlavorUtils):
 
   def install(self):
+    # Set up the device
+    self.m.run(self.m.step, 'setup_device', cmd=['ios.py'], infra_step=True)
+
+    # Install the app.
+    for app_name in ['dm', 'nanobench']:
+      app_package = self.m.vars.skia_out.join(self.m.vars.configuration,
+                                              '%s.app' % app_name)
+      self.m.run(self.m.step,
+                'install_' + app_name,
+                cmd=['ideviceinstaller', '-i', app_package],
+                infra_step=True)
+
     self.device_dirs = default_flavor.DeviceDirs(
         dm_dir='dm',
         perf_data_dir='perf',
@@ -33,21 +42,20 @@ class iOSFlavorUtils(gn_flavor.GNFlavorUtils):
     for app in ['dm', 'nanobench']:
       self._py('package ' + app,
               self.m.vars.skia_dir.join('gn', 'package_ios.py'),
-              args=[self.out_dir.join(app)])
+              args=[self.out_dir.join(app)], infra_step=True)
 
   def step(self, name, cmd, env=None, **kwargs):
-    app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
-
-    self._run(name,
-              ['ios-deploy', '-b', '%s.app' % app,
-               '-I', '--args', ' '.join(map(str, cmd[1:]))])
+    bundle_id = 'com.google.%s' % cmd[0]
+    self.m.run(self.m.step, name,
+               cmd=['idevice-app-runner', '-s', bundle_id, '--args'] +
+                    map(str, cmd[1:]))
 
   def _run_ios_script(self, script, first, *rest):
     full = self.m.vars.skia_dir.join('platform_tools/ios/bin/ios_' + script)
     self.m.run(self.m.step,
                name = '%s %s' % (script, first),
                cmd = [full, first] + list(rest),
-               infra_step=kInfraStep)
+               infra_step=True)
 
   def copy_file_to_device(self, host, device):
     self._run_ios_script('push_file', host, device)
@@ -71,6 +79,6 @@ class iOSFlavorUtils(gn_flavor.GNFlavorUtils):
                     name = 'cat_file %s' % path,
                     cmd = [full, path],
                     stdout=self.m.raw_io.output(),
-                    infra_step=kInfraStep,
+                    infra_step=True,
                     **kwargs)
     return rv.stdout.rstrip() if rv and rv.stdout else None

diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index 263cbd8..26f11e0 100644 (file)
--- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -1,6 +1,55 @@
 [
   {
     "cmd": [
+      "ios.py"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "setup_device"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Release/dm.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Release/nanobench.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_nanobench"
+  },
+  {
+    "cmd": [
       "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
       "[START_DIR]/skia/resources",
       "resources"
@@ -9,9 +58,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skia/resources"
   },
   {
@@ -23,7 +74,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded SKP VERSION"
@@ -37,7 +89,8 @@
       "[START_DIR]/tmp/SKP_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SKP_VERSION"
@@ -51,9 +104,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SKP_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -66,9 +121,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SKP_VERSION"
   },
   {
@@ -80,9 +137,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm skps"
   },
   {
@@ -94,9 +153,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir skps"
   },
   {
@@ -109,9 +170,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skp"
   },
   {
@@ -124,9 +187,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SKP_VERSION"
   },
   {
@@ -138,7 +203,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded skimage VERSION"
@@ -152,7 +218,8 @@
       "[START_DIR]/tmp/SK_IMAGE_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SK_IMAGE_VERSION"
@@ -166,9 +233,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SK_IMAGE_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -181,9 +250,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SK_IMAGE_VERSION"
   },
   {
@@ -195,9 +266,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm images"
   },
   {
@@ -209,9 +282,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir images"
   },
   {
@@ -224,9 +299,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skimage"
   },
   {
@@ -239,9 +316,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
   },
   {
@@ -253,7 +332,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded SVG VERSION"
@@ -267,7 +347,8 @@
       "[START_DIR]/tmp/SVG_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SVG_VERSION"
@@ -281,9 +362,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SVG_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -296,9 +379,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SVG_VERSION"
   },
   {
@@ -310,9 +395,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm svgs"
   },
   {
@@ -324,9 +411,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir svgs"
   },
   {
@@ -339,9 +428,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/svg"
   },
   {
@@ -354,9 +445,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SVG_VERSION"
   },
   {
@@ -368,9 +461,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm perf"
   },
   {
@@ -382,9 +477,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir perf"
   },
   {
@@ -394,7 +491,8 @@
       "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "name": "get swarming bot id",
     "stdout": "/path/to/tmp/",
@@ -411,7 +509,8 @@
       "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "name": "get swarming task id",
     "stdout": "/path/to/tmp/",
@@ -423,17 +522,88 @@
   },
   {
     "cmd": [
-      "ios-deploy",
-      "-b",
-      "[START_DIR]/out/Release/nanobench.app",
-      "-I",
+      "idevice-app-runner",
+      "-s",
+      "com.google.nanobench",
       "--args",
-      "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id  swarming_task_id  --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
+      "--undefok",
+      "-i",
+      "resources",
+      "--skps",
+      "skps",
+      "--images",
+      "images/nanobench",
+      "--svgs",
+      "svgs",
+      "--nocpu",
+      "--pre_log",
+      "--images",
+      "--gpuStatsDump",
+      "true",
+      "--scales",
+      "1.0",
+      "1.1",
+      "--skps",
+      "ignore_skps",
+      "--config",
+      "8888",
+      "nonrendering",
+      "hwui",
+      "gles",
+      "--match",
+      "~blurroundrect",
+      "~patch_grid",
+      "~desk_carsvg",
+      "~keymobi",
+      "~path_hairline",
+      "~GLInstancedArraysBench",
+      "~inc0.gif",
+      "~inc1.gif",
+      "~incInterlaced.gif",
+      "~inc0.jpg",
+      "~incGray.jpg",
+      "~inc0.wbmp",
+      "~inc1.wbmp",
+      "~inc0.webp",
+      "~inc1.webp",
+      "~inc0.ico",
+      "~inc1.ico",
+      "~inc0.png",
+      "~inc1.png",
+      "~inc2.png",
+      "~inc12.png",
+      "~inc13.png",
+      "~inc14.png",
+      "~inc0.webp",
+      "~inc1.webp",
+      "--outResultsFile",
+      "perf/nanobench_abc123_1337000001.json",
+      "--properties",
+      "gitHash",
+      "abc123",
+      "swarming_bot_id",
+      "",
+      "swarming_task_id",
+      "",
+      "--key",
+      "arch",
+      "arm",
+      "compiler",
+      "Clang",
+      "cpu_or_gpu",
+      "GPU",
+      "cpu_or_gpu_value",
+      "GX6450",
+      "model",
+      "iPadMini4",
+      "os",
+      "iOS"
     ],
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
@@ -448,7 +618,8 @@
       "511"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.nanobench"
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "name": "makedirs perf_dir",
     "~followup_annotations": [
@@ -474,9 +645,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "pull_if_needed perf"
   },
   {

diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 57ce232..2d3cef0 100644 (file)
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -300,6 +300,7 @@ def RunSteps(api):
   env = {}
   if 'iOS' in api.vars.builder_name:
     env['IOS_BUNDLE_ID'] = 'com.google.nanobench'
+    env['IOS_MOUNT_POINT'] = api.vars.slave_dir.join('mnt_iosdevice')
   with api.env(env):
     try:
       if 'Chromecast' in api.vars.builder_name:

diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index b5493e5..8bfb72a 100644 (file)
--- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -1,6 +1,55 @@
 [
   {
     "cmd": [
+      "ios.py"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "setup_device"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Release/dm.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
+      "-i",
+      "[START_DIR]/out/Release/nanobench.app"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "install_nanobench"
+  },
+  {
+    "cmd": [
       "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
       "[START_DIR]/skia/resources",
       "resources"
@@ -9,9 +58,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skia/resources"
   },
   {
@@ -23,7 +74,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded SKP VERSION"
@@ -37,7 +89,8 @@
       "[START_DIR]/tmp/SKP_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SKP_VERSION"
@@ -51,9 +104,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SKP_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -66,9 +121,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SKP_VERSION"
   },
   {
@@ -80,9 +137,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm skps"
   },
   {
@@ -94,9 +153,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir skps"
   },
   {
@@ -109,9 +170,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skp"
   },
   {
@@ -124,9 +187,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SKP_VERSION"
   },
   {
@@ -138,7 +203,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded skimage VERSION"
@@ -152,7 +218,8 @@
       "[START_DIR]/tmp/SK_IMAGE_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SK_IMAGE_VERSION"
@@ -166,9 +233,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SK_IMAGE_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -181,9 +250,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SK_IMAGE_VERSION"
   },
   {
@@ -195,9 +266,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm images"
   },
   {
@@ -209,9 +282,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir images"
   },
   {
@@ -224,9 +299,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/skimage"
   },
   {
@@ -239,9 +316,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
   },
   {
@@ -253,7 +332,8 @@
       "/path/to/tmp/"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "Get downloaded SVG VERSION"
@@ -267,7 +347,8 @@
       "[START_DIR]/tmp/SVG_VERSION"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "write SVG_VERSION"
@@ -281,9 +362,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "cat_file tmp/SVG_VERSION",
     "stdout": "/path/to/tmp/"
   },
@@ -296,9 +379,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm tmp/SVG_VERSION"
   },
   {
@@ -310,9 +395,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm svgs"
   },
   {
@@ -324,9 +411,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir svgs"
   },
   {
@@ -339,9 +428,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_if_needed [START_DIR]/svg"
   },
   {
@@ -354,9 +445,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/SVG_VERSION"
   },
   {
@@ -369,6 +462,7 @@
     ],
     "env": {
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts"
     },
     "infra_step": true,
@@ -383,7 +477,8 @@
       "511"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "makedirs dm",
@@ -409,9 +504,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "rm dm"
   },
   {
@@ -423,9 +520,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "mkdir dm"
   },
   {
@@ -437,7 +536,8 @@
       "511"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "infra_step": true,
     "name": "makedirs tmp_dir",
@@ -465,6 +565,7 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
@@ -514,9 +615,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt"
   },
   {
@@ -526,7 +629,8 @@
       "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "name": "get swarming bot id",
     "stdout": "/path/to/tmp/",
@@ -543,7 +647,8 @@
       "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
     ],
     "env": {
-      "IOS_BUNDLE_ID": "com.google.dm"
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
     },
     "name": "get swarming task id",
     "stdout": "/path/to/tmp/",
@@ -555,17 +660,464 @@
   },
   {
     "cmd": [
-      "ios-deploy",
-      "-b",
-      "[START_DIR]/out/Release/dm.app",
-      "-I",
+      "idevice-app-runner",
+      "-s",
+      "com.google.dm",
       "--args",
-      "--undefok --resourcePath resources --skps skps --images images/dm --colorImages images/colorspace --nameByHash --properties gitHash abc123 builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release swarming_bot_id  swarming_task_id  --svgs svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile tmp/uninteresting_hashes.txt --writePath dm --nocpu --randomProcessorTest --config 8888 srgb pdf gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ gles skp _ _ _ image gen_platf rgba32abf.bmp _ image gen_platf rgb24prof.bmp _ image gen_platf rgb24lprof.bmp _ image gen_platf 8bpp-pixeldata-cropped.bmp _ image gen_platf 4bpp-pixeldata-cropped.bmp _ image gen_platf 32bpp-pixeldata-cropped.bmp _ image gen_platf 24bpp-pixeldata-cropped.bmp _ image gen_platf frame_larger_than_image.gif _ image gen_platf inc0.png _ image gen_platf inc1.png _ image gen_platf inc2.png _ image gen_platf inc3.png _ image gen_platf inc4.png _ image gen_platf inc5.png _ image gen_platf inc6.png _ image gen_platf inc7.png _ image gen_platf inc8.png _ image gen_platf inc9.png _ image gen_platf inc10.png _ image gen_platf inc11.png _ image gen_platf inc12.png _ image gen_platf inc13.png _ image gen_platf inc14.png _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW"
+      "--undefok",
+      "--resourcePath",
+      "resources",
+      "--skps",
+      "skps",
+      "--images",
+      "images/dm",
+      "--colorImages",
+      "images/colorspace",
+      "--nameByHash",
+      "--properties",
+      "gitHash",
+      "abc123",
+      "builder",
+      "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
+      "swarming_bot_id",
+      "",
+      "swarming_task_id",
+      "",
+      "--svgs",
+      "svgs",
+      "--key",
+      "arch",
+      "arm",
+      "compiler",
+      "Clang",
+      "configuration",
+      "Release",
+      "cpu_or_gpu",
+      "GPU",
+      "cpu_or_gpu_value",
+      "GX6450",
+      "model",
+      "iPadMini4",
+      "os",
+      "iOS",
+      "--uninterestingHashesFile",
+      "tmp/uninteresting_hashes.txt",
+      "--writePath",
+      "dm",
+      "--nocpu",
+      "--randomProcessorTest",
+      "--config",
+      "8888",
+      "srgb",
+      "pdf",
+      "gles",
+      "glesdft",
+      "glessrgb",
+      "glesmsaa4",
+      "serialize-8888",
+      "tiles_rt-8888",
+      "pic-8888",
+      "--src",
+      "tests",
+      "gm",
+      "image",
+      "colorImage",
+      "svg",
+      "--blacklist",
+      "glessrgb",
+      "image",
+      "_",
+      "_",
+      "8888",
+      "image",
+      "_",
+      "_",
+      "gles",
+      "skp",
+      "_",
+      "_",
+      "_",
+      "image",
+      "gen_platf",
+      "rgba32abf.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rgb24prof.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rgb24lprof.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "8bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "4bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "32bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "24bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "frame_larger_than_image.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc0.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc1.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc2.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc3.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc4.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc5.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc6.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc7.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc8.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc9.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc10.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc11.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc12.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc13.png",
+      "_",
+      "image",
+      "gen_platf",
+      "inc14.png",
+      "_",
+      "test",
+      "_",
+      "GrShape",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed_image",
+      "serialize-8888",
+      "gm",
+      "_",
+      "c_gms",
+      "serialize-8888",
+      "gm",
+      "_",
+      "colortype",
+      "serialize-8888",
+      "gm",
+      "_",
+      "colortype_xfermodes",
+      "serialize-8888",
+      "gm",
+      "_",
+      "drawfilter",
+      "serialize-8888",
+      "gm",
+      "_",
+      "fontmgr_bounds_0.75_0",
+      "serialize-8888",
+      "gm",
+      "_",
+      "fontmgr_bounds_1_-0.25",
+      "serialize-8888",
+      "gm",
+      "_",
+      "fontmgr_bounds",
+      "serialize-8888",
+      "gm",
+      "_",
+      "fontmgr_match",
+      "serialize-8888",
+      "gm",
+      "_",
+      "fontmgr_iter",
+      "serialize-8888",
+      "gm",
+      "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bitmapfilters",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bitmapshaders",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed_alpha_bmp",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed_alpha_bmp_shader",
+      "serialize-8888",
+      "gm",
+      "_",
+      "convex_poly_clip",
+      "serialize-8888",
+      "gm",
+      "_",
+      "extractalpha",
+      "serialize-8888",
+      "gm",
+      "_",
+      "filterbitmap_checkerboard_32_32_g8",
+      "serialize-8888",
+      "gm",
+      "_",
+      "filterbitmap_image_mandrill_64",
+      "serialize-8888",
+      "gm",
+      "_",
+      "shadows",
+      "serialize-8888",
+      "gm",
+      "_",
+      "simpleaaclip_aaclip",
+      "serialize-8888",
+      "gm",
+      "_",
+      "composeshader_bitmap",
+      "serialize-8888",
+      "gm",
+      "_",
+      "scaled_tilemodes_npot",
+      "serialize-8888",
+      "gm",
+      "_",
+      "scaled_tilemodes",
+      "serialize-8888",
+      "gm",
+      "_",
+      "typefacerendering_pfaMac",
+      "serialize-8888",
+      "gm",
+      "_",
+      "parsedpaths",
+      "serialize-8888",
+      "gm",
+      "_",
+      "ImageGeneratorExternal_rect",
+      "serialize-8888",
+      "gm",
+      "_",
+      "ImageGeneratorExternal_shader",
+      "serialize-8888",
+      "gm",
+      "_",
+      "shadow_utils",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed_alpha_image",
+      "serialize-8888",
+      "gm",
+      "_",
+      "bleed_alpha_image_shader",
+      "pic-8888",
+      "gm",
+      "_",
+      "drawfilter",
+      "pic-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-picture",
+      "serialize-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-picture",
+      "pic-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-raster",
+      "serialize-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-raster",
+      "pic-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-ctable",
+      "serialize-8888",
+      "gm",
+      "_",
+      "image-cacherator-from-ctable",
+      "pic-8888",
+      "gm",
+      "_",
+      "gamut",
+      "serialize-8888",
+      "gm",
+      "_",
+      "gamut",
+      "pic-8888",
+      "gm",
+      "_",
+      "complexclip4_bw",
+      "serialize-8888",
+      "gm",
+      "_",
+      "complexclip4_bw",
+      "pic-8888",
+      "gm",
+      "_",
+      "complexclip4_aa",
+      "serialize-8888",
+      "gm",
+      "_",
+      "complexclip4_aa",
+      "tiles_rt-8888",
+      "gm",
+      "_",
+      "complexclip4_bw",
+      "tiles_rt-8888",
+      "gm",
+      "_",
+      "complexclip4_aa",
+      "_",
+      "image",
+      "_",
+      "interlaced1.png",
+      "_",
+      "image",
+      "_",
+      "interlaced2.png",
+      "_",
+      "image",
+      "_",
+      "interlaced3.png",
+      "_",
+      "image",
+      "_",
+      ".arw",
+      "_",
+      "image",
+      "_",
+      ".cr2",
+      "_",
+      "image",
+      "_",
+      ".dng",
+      "_",
+      "image",
+      "_",
+      ".nef",
+      "_",
+      "image",
+      "_",
+      ".nrw",
+      "_",
+      "image",
+      "_",
+      ".orf",
+      "_",
+      "image",
+      "_",
+      ".raf",
+      "_",
+      "image",
+      "_",
+      ".rw2",
+      "_",
+      "image",
+      "_",
+      ".pef",
+      "_",
+      "image",
+      "_",
+      ".srw",
+      "_",
+      "image",
+      "_",
+      ".ARW",
+      "_",
+      "image",
+      "_",
+      ".CR2",
+      "_",
+      "image",
+      "_",
+      ".DNG",
+      "_",
+      "image",
+      "_",
+      ".NEF",
+      "_",
+      "image",
+      "_",
+      ".NRW",
+      "_",
+      "image",
+      "_",
+      ".ORF",
+      "_",
+      "image",
+      "_",
+      ".RAF",
+      "_",
+      "image",
+      "_",
+      ".RW2",
+      "_",
+      "image",
+      "_",
+      ".PEF",
+      "_",
+      "image",
+      "_",
+      ".SRW"
     ],
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
@@ -581,9 +1133,11 @@
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
       "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[START_DIR]/out"
     },
+    "infra_step": true,
     "name": "pull_if_needed dm"
   },
   {

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 8625b11..50fd90e 100644 (file)
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -692,6 +692,7 @@ def RunSteps(api):
   env = api.step.get_from_context('env', {})
   if 'iOS' in api.vars.builder_name:
     env['IOS_BUNDLE_ID'] = 'com.google.dm'
+    env['IOS_MOUNT_POINT'] = api.vars.slave_dir.join('mnt_iosdevice')
   with api.step.context({'env': env}):
     try:
       api.flavor.install_everything()

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 855a766..86fc963 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1268,6 +1268,42 @@
         "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release"
       ]
     },
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+      ]
+    },
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+      ]
+    },
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+      ]
+    },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -2144,6 +2180,42 @@
       "tasks": [
         "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release"
       ]
+    },
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+      ]
+    },
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+      ]
+    },
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+      ]
+    },
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+      ]
     }
   },
   "tasks": {
@@ -10696,7 +10768,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10715,13 +10787,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "device:iPad6,3",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10729,9 +10801,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10740,11 +10812,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10763,13 +10835,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "device:iPad6,3",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10777,9 +10849,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10788,11 +10860,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10811,13 +10883,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-mipsel-Debug-Android",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:ci20",
-        "os:Android",
+        "device:iPhone7,2",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10825,9 +10897,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10836,11 +10908,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10859,13 +10931,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-mipsel-Release-Android",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:ci20",
-        "os:Android",
+        "device:iPhone7,2",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10873,9 +10945,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10884,11 +10956,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10907,13 +10979,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:MMB29K",
-        "device_type:zerofltetmo",
-        "os:Android",
+        "device:iPhone9,1",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10921,9 +10993,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10932,11 +11004,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10955,13 +11027,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:MMB29K",
-        "device_type:zerofltetmo",
-        "os:Android",
+        "device:iPhone9,1",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10969,9 +11041,9 @@
       "extra_args": [
         "--workdir",
         "../../..",
-        "test",
+        "perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10980,11 +11052,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "perf_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11003,12 +11075,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M_G930AUCS4BQC2",
-        "device_type:heroqlteatt",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
@@ -11019,7 +11091,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11032,7 +11104,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11051,12 +11123,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M_G930AUCS4BQC2",
-        "device_type:heroqlteatt",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
@@ -11067,7 +11139,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11080,7 +11152,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
+    "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11099,12 +11171,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Ubuntu-Clang-mipsel-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M_G930FXXU1DQAS",
-        "device_type:herolte",
+        "device_os:NRD90M",
+        "device_type:ci20",
         "os:Android",
         "pool:Skia"
       ],
@@ -11115,7 +11187,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11128,7 +11200,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
+    "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11147,12 +11219,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-mipsel-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M_G930FXXU1DQAS",
-        "device_type:herolte",
+        "device_os:NRD90M",
+        "device_type:ci20",
         "os:Android",
         "pool:Skia"
       ],
@@ -11163,7 +11235,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11176,7 +11248,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11195,12 +11267,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NPJ25.93-14",
-        "device_type:athene",
+        "device_os:MMB29K",
+        "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
       ],
@@ -11211,7 +11283,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11224,7 +11296,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11243,12 +11315,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NPJ25.93-14",
-        "device_type:athene",
+        "device_os:MMB29K",
+        "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
       ],
@@ -11259,7 +11331,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11272,7 +11344,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
+    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11295,8 +11367,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:foster",
+        "device_os:NRD90M_G930AUCS4BQC2",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -11307,7 +11379,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11320,7 +11392,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11339,12 +11411,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:foster",
+        "device_os:NRD90M_G930AUCS4BQC2",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -11355,7 +11427,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11368,7 +11440,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11387,12 +11459,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:foster",
+        "device_os:NRD90M_G930FXXU1DQAS",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
@@ -11403,7 +11475,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11416,7 +11488,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11435,12 +11507,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:foster",
+        "device_os:NRD90M_G930FXXU1DQAS",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
@@ -11451,7 +11523,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11464,7 +11536,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11487,8 +11559,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NPJ25.93-14",
+        "device_type:athene",
         "os:Android",
         "pool:Skia"
       ],
@@ -11499,7 +11571,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11512,7 +11584,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11535,8 +11607,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NPJ25.93-14",
+        "device_type:athene",
         "os:Android",
         "pool:Skia"
       ],
@@ -11547,7 +11619,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11560,7 +11632,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11579,12 +11651,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NRD90M",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -11595,7 +11667,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11608,7 +11680,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11627,12 +11699,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NRD90M",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -11643,7 +11715,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11656,7 +11728,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11675,12 +11747,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:M4B30Z",
-        "device_type:hammerhead",
+        "device_os:NRD90M",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -11691,7 +11763,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11704,7 +11776,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11723,12 +11795,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android",
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:M4B30Z",
-        "device_type:hammerhead",
+        "device_os:NRD90M",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -11739,7 +11811,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11752,7 +11824,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11771,12 +11843,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -11787,7 +11859,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11800,7 +11872,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11819,12 +11891,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -11835,7 +11907,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11848,7 +11920,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11867,12 +11939,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -11883,7 +11955,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11896,7 +11968,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11915,12 +11987,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -11931,7 +12003,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11944,7 +12016,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11967,8 +12039,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:M4B30Z",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
@@ -11979,7 +12051,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11992,7 +12064,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12015,8 +12087,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:M4B30Z",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
@@ -12027,7 +12099,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12040,7 +12112,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12059,12 +12131,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
@@ -12075,7 +12147,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12088,7 +12160,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12107,12 +12179,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android",
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
@@ -12123,7 +12195,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12136,7 +12208,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12155,12 +12227,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
@@ -12171,7 +12243,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12184,7 +12256,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12203,12 +12275,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
@@ -12219,7 +12291,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12232,7 +12304,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12251,12 +12323,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android",
+        "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -12267,7 +12339,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12280,7 +12352,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12299,12 +12371,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan",
+        "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
-        "device_type:fugu",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -12315,7 +12387,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12328,7 +12400,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12347,12 +12419,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Ubuntu-Clang-x86-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26H",
-        "device_type:dragon",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12363,7 +12435,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12376,7 +12448,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12395,12 +12467,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-x86-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26H",
-        "device_type:dragon",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12411,7 +12483,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12424,7 +12496,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12443,12 +12515,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android",
+        "Build-Ubuntu-Clang-x86-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12459,7 +12531,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12472,7 +12544,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12491,12 +12563,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12507,7 +12579,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12520,7 +12592,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12539,12 +12611,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android",
+        "Build-Ubuntu-Clang-x86-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12555,7 +12627,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12568,7 +12640,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12587,12 +12659,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:OPP1.170223.012",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -12603,7 +12675,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12616,7 +12688,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12635,12 +12707,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT604",
-        "os:ChromeOS",
+        "device_os:NMF26H",
+        "device_type:dragon",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12650,7 +12723,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12663,7 +12736,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12682,12 +12755,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT604",
-        "os:ChromeOS",
+        "device_os:NMF26H",
+        "device_type:dragon",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12697,7 +12771,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12710,7 +12784,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12729,12 +12803,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT860",
-        "os:ChromeOS",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12744,7 +12819,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12757,7 +12832,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12776,12 +12851,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT860",
-        "os:ChromeOS",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12791,7 +12867,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12804,7 +12880,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12823,12 +12899,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT764",
-        "os:ChromeOS",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12838,7 +12915,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12851,7 +12928,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12870,12 +12947,13 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:MaliT764",
-        "os:ChromeOS",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12885,7 +12963,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12898,7 +12976,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug": {
+    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12921,7 +12999,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:TegraK1",
+        "gpu:MaliT604",
         "os:ChromeOS",
         "pool:Skia"
       ],
@@ -12932,7 +13010,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug",
+        "buildername=Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12945,7 +13023,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release": {
+    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12968,7 +13046,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:TegraK1",
+        "gpu:MaliT604",
         "os:ChromeOS",
         "pool:Skia"
       ],
@@ -12979,7 +13057,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release",
+        "buildername=Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12992,7 +13070,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13011,13 +13089,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:MaliT860",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13027,7 +13104,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13040,7 +13117,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13059,13 +13136,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "gpu:MaliT860",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13075,7 +13151,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13088,7 +13164,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+    "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13107,12 +13183,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:MaliT764",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13122,7 +13198,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+        "buildername=Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13135,7 +13211,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13154,12 +13230,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:MaliT764",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13169,7 +13245,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13182,7 +13258,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+    "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13201,12 +13277,12 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "gpu:TegraK1",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13216,7 +13292,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+        "buildername=Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13229,7 +13305,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13248,13 +13324,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:TegraK1",
+        "os:ChromeOS",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13264,7 +13339,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13277,7 +13352,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13293,21 +13368,16 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
-        "os:Ubuntu-14.04",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13317,7 +13387,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13330,7 +13400,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13346,31 +13416,26 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-MSAN",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
-        "os:Ubuntu-14.04",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13383,7 +13448,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13402,13 +13467,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13418,7 +13482,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13431,7 +13495,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13447,21 +13511,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13471,7 +13529,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13484,7 +13542,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13503,13 +13561,12 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Fast",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13519,7 +13576,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13532,7 +13589,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13548,15 +13605,10 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "Build-Ubuntu-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -13572,7 +13624,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13585,7 +13637,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13613,7 +13665,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13624,7 +13677,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13637,7 +13690,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13661,22 +13714,23 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 32400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13689,7 +13743,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13705,19 +13759,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "Build-Ubuntu-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13728,7 +13778,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13741,7 +13791,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13757,10 +13807,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86-Debug",
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -13776,7 +13831,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13789,7 +13844,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13808,7 +13863,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
+        "Build-Ubuntu-Clang-x86_64-Release-Fast",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -13824,7 +13879,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13837,17 +13892,47 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "ct_skps",
+        "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13855,21 +13940,555 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:8"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-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-Ubuntu-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-Ubuntu-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-Ubuntu-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-Ubuntu-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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "buildername=Test-Ubuntu-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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "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": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13878,20 +14497,45 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:50"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "ct_skps",
+        "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13900,10 +14544,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13922,12 +14567,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "Build-Ubuntu-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
+        "gpu:10de:11c0",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13938,7 +14582,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13951,7 +14595,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -13974,8 +14618,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
+        "gpu:10de:11c0",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -13986,7 +14629,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -13999,7 +14642,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14018,12 +14661,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD",
+        "Build-Ubuntu-GCC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
+        "gpu:10de:1401",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
@@ -14034,7 +14676,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14047,7 +14689,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14070,18 +14712,18 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244",
+        "gpu:10de:1401",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14089,12 +14731,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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14110,25 +14752,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
+        "Build-Ubuntu-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu-14.04",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14136,12 +14783,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-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14157,25 +14804,30 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
+        "Build-Ubuntu-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu-14.04",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14183,12 +14835,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-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14204,15 +14856,20 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
+        "Build-Ubuntu-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14222,7 +14879,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14235,7 +14892,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14251,15 +14908,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "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",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14269,7 +14936,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14282,7 +14949,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14298,15 +14965,20 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
+        "Build-Ubuntu-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14316,7 +14988,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14329,7 +15001,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14345,15 +15017,25 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
+        },
+        {
+          "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:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14363,7 +15045,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14376,7 +15058,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14404,7 +15086,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:0f31",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -14415,7 +15097,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14428,7 +15110,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14456,7 +15138,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:0f31",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -14467,7 +15149,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14480,7 +15162,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14508,7 +15190,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0102",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -14519,7 +15201,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14532,7 +15214,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14550,22 +15232,17 @@
           "version": "version:5"
         },
         {
-          "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",
-          "version": "version:4"
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan",
+        "Build-Ubuntu-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0102",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
@@ -14576,7 +15253,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14589,7 +15266,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14605,20 +15282,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14628,7 +15300,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14637,11 +15309,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14654,28 +15326,18 @@
           "version": "version:50"
         },
         {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        },
-        {
-          "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:6"
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14685,7 +15347,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14694,11 +15356,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14714,20 +15376,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14737,7 +15394,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14746,11 +15403,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14766,20 +15423,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14789,7 +15441,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14798,11 +15450,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14818,20 +15470,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0102",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14841,7 +15488,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14850,11 +15497,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14870,20 +15517,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:5"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:6"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0102",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14893,7 +15535,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14902,11 +15544,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
+      "isolate": "test_skia_bundled_win.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14925,12 +15567,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
-        "os:Windows-10-14393",
+        "gpu:10de:104a",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14940,7 +15582,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -14953,7 +15595,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -14976,7 +15618,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -14987,7 +15629,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15000,7 +15642,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
+    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15019,11 +15661,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15034,7 +15676,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15047,7 +15689,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15066,11 +15708,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15081,7 +15723,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15094,7 +15736,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15113,11 +15755,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15128,7 +15770,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15141,7 +15783,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15160,11 +15802,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15175,7 +15817,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15188,7 +15830,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15211,8 +15853,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Windows-10-10586",
+        "gpu:8086:1926",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -15222,7 +15864,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15235,7 +15877,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15254,11 +15896,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15269,7 +15911,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15282,7 +15924,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15301,11 +15943,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15316,7 +15958,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15329,7 +15971,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15352,7 +15994,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15363,7 +16006,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15376,7 +16019,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15395,11 +16038,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15410,7 +16054,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15423,7 +16067,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15442,11 +16086,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0a16",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15457,7 +16101,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15470,7 +16114,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release": {
+    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15489,11 +16133,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0a16",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15504,7 +16148,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15517,7 +16161,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15536,11 +16180,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0a16",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15551,7 +16195,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15564,7 +16208,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15583,11 +16227,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0a16",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15598,7 +16242,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15611,7 +16255,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15634,8 +16278,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-highcpu-8",
+        "gpu:1002:683d",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15646,7 +16289,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15659,7 +16302,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15682,8 +16325,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-highcpu-8",
+        "gpu:1002:683d",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15694,7 +16336,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15707,7 +16349,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15730,7 +16372,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15741,7 +16383,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15754,7 +16396,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15773,11 +16415,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15788,7 +16430,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15801,7 +16443,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15824,7 +16466,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15835,7 +16477,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15848,7 +16490,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15867,11 +16509,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16",
+        "gpu:8086:0412",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15882,7 +16524,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15895,7 +16537,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15914,11 +16556,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d",
+        "gpu:8086:0412",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15929,7 +16571,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15942,7 +16584,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -15961,11 +16603,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -15976,7 +16619,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -15989,7 +16632,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16008,11 +16651,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16023,7 +16667,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16036,7 +16680,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16055,11 +16699,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16070,7 +16715,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16083,7 +16728,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16102,11 +16747,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16117,7 +16763,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16130,7 +16776,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16153,7 +16799,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0412",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16164,7 +16810,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16177,7 +16823,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16196,11 +16842,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0412",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16211,7 +16857,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16224,7 +16870,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16243,12 +16889,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16259,7 +16904,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16272,7 +16917,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16291,12 +16936,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16307,7 +16951,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16320,7 +16964,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16339,12 +16983,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16355,7 +16998,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16368,7 +17011,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16387,12 +17030,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:1ba1",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -16403,7 +17045,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16416,7 +17058,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16435,12 +17077,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-MSVC-x86-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16450,7 +17093,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16463,7 +17106,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16482,12 +17125,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16497,7 +17141,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16510,7 +17154,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16529,12 +17173,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16544,7 +17189,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16557,7 +17202,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16576,12 +17221,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Debug-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16591,7 +17237,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16604,7 +17250,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16623,12 +17269,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16638,7 +17285,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16651,7 +17298,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16670,12 +17317,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
+        "Build-Win-MSVC-x86_64-Release-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
-        "os:Windows-10-14393",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16685,7 +17333,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16698,7 +17346,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16723,7 +17371,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16733,7 +17381,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16746,7 +17394,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16771,7 +17419,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16781,7 +17429,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16794,7 +17442,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16819,7 +17467,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16829,7 +17477,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16842,7 +17490,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16867,7 +17515,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16877,7 +17525,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16890,7 +17538,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16915,7 +17563,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16925,7 +17573,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16938,7 +17586,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -16963,7 +17611,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Windows-7-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -16973,7 +17621,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16986,7 +17634,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17011,7 +17659,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17021,7 +17669,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17034,7 +17682,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17059,7 +17707,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17069,7 +17717,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17082,7 +17730,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17107,7 +17755,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17117,7 +17765,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17130,7 +17778,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17155,7 +17803,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17165,7 +17813,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17178,7 +17826,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17203,7 +17851,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17213,7 +17861,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17226,7 +17874,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release-GDI": {
+    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17251,7 +17899,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17261,7 +17909,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
+        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17274,7 +17922,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug": {
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17293,13 +17941,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17309,7 +17956,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17318,11 +17965,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86-Release": {
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17341,13 +17988,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17357,7 +18003,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86-Release",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17366,11 +18012,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17389,13 +18035,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+      ],
+      "dimensions": [
+        "device:iPad6,3",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17405,7 +18051,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17414,11 +18060,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17437,13 +18083,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+        "device:iPad6,3",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17453,7 +18099,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17462,11 +18108,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17485,13 +18131,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+        "device:iPhone7,2",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17501,7 +18147,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17510,11 +18156,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17533,13 +18179,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-GDI",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-8.1-SP0",
+        "device:iPhone7,2",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17549,7 +18195,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17558,11 +18204,11 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
+      "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17585,8 +18231,9 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "device:iPhone9,1",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17596,7 +18243,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17609,7 +18256,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17632,8 +18279,9 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "device:iPhone9,1",
+        "machine_type:RaspberryPi",
+        "os:iOS-10.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17643,7 +18291,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19303,6 +19951,87 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "dependencies": [
         "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
@@ -22893,6 +23622,168 @@
       ],
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+      "dependencies": [
+        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
     }
   }
 }

diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh
index 3768396..0988722 100755 (executable)
--- a/platform_tools/ios/bin/ios_setup.sh
+++ b/platform_tools/ios/bin/ios_setup.sh
@@ -9,7 +9,9 @@
 # ios_setup.sh: Sets environment variables used by other iOS scripts.
 
 # File system location where we mount the ios devices.
-IOS_MOUNT_POINT="/tmp/mnt_iosdevice"
+if [[ -z "${IOS_MOUNT_POINT}" ]]; then
+  IOS_MOUNT_POINT="/tmp/mnt_iosdevice"
+fi
 
 # Location on the ios device where all data are stored. This is
 # relative to the mount point.
@@ -88,10 +90,12 @@ ios_mkdir() {
 
 ios_cat() {
   local TARGET="$IOS_MOUNT_POINT/$IOS_DOCS_DIR/$1"
+  >&2 echo "target: '${TARGET}''"
   ios_mount
-  RET="$(cat $TARGET)"
+  RET="$( cat ${TARGET} )"
   ios_umount
-  echo -e "$RET"
+  >&2 echo "Result: '${RET}'"
+  echo -e "${RET}"
 }
 
 # ios_mount: mounts the iOS device for reading or writing.
@@ -107,14 +111,18 @@ ios_mount() {
     mkdir -p $IOS_MOUNT_POINT
   fi
   ifuse --container $IOS_BUNDLE_ID $IOS_MOUNT_POINT
-  sleep 1
+
+  sleep 2
+  if [[ ! -d "${IOS_MOUNT_POINT}/${IOS_DOCS_DIR}" ]]; then
+    exit 1
+  fi
   >&2 echo "Successfully mounted device."
   #find $IOS_MOUNT_POINT
 }
 
 # ios_umount: unmounts the ios device.
 ios_umount() {
-  umount $IOS_MOUNT_POINT
+  sudo umount $IOS_MOUNT_POINT
   sleep 1
 }
 
@@ -133,7 +141,7 @@ ios_pull() {
 
   ios_mount
   if [[ -d "${HOST_DST}" ]]; then
-    cp -r "$IOS_SRC/" "$HOST_DST"
+    cp -r "$IOS_SRC/." "$HOST_DST"
   else
     cp -r "$IOS_SRC" "$HOST_DST"
   fi
@@ -149,7 +157,7 @@ ios_push() {
   ios_mount
   rm -rf $IOS_DST
   mkdir -p "$(dirname $IOS_DST)"
-  cp -r "$HOST_SRC" "$IOS_DST"
+  cp -r -L "$HOST_SRC" "$IOS_DST"
   ios_umount
 }