Isolate CIPD assets for RPI tasks

To verify the assets all end up in the right spot, I wiped all the assets off the phone and then ran
https://chromium-swarm.appspot.com/task?id=36114ccaa41bd810&refresh=10

Overhead comparisons:
Control: 103s https://chromium-swarm.appspot.com/task?id=360e10170744db10

Cold cache: 105s https://chromium-swarm.appspot.com/task?id=36113c4aec720910
Warm cache: 8s https://chromium-swarm.appspot.com/task?id=361143954c1b1c10

Bug:701930
Bug:skia:5213

Change-Id: I1dc052203ed404b63d0a1974ccbe882d26ff9e48
Reviewed-on: https://skia-review.googlesource.com/16490
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index bf73725..1f29dc6 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -26,7 +26,10 @@ import (
 )
 
 const (
-       BUNDLE_RECIPES_NAME = "Housekeeper-PerCommit-BundleRecipes"
+       BUNDLE_RECIPES_NAME  = "Housekeeper-PerCommit-BundleRecipes"
+       ISOLATE_SKIMAGE_NAME = "Housekeeper-PerCommit-IsolateSkImage"
+       ISOLATE_SKP_NAME     = "Housekeeper-PerCommit-IsolateSKP"
+       ISOLATE_SVG_NAME     = "Housekeeper-PerCommit-IsolateSVG"
 
        DEFAULT_OS       = DEFAULT_OS_LINUX
        DEFAULT_OS_LINUX = "Ubuntu-14.04"
@@ -249,7 +252,7 @@ func bundleRecipes(b *specs.TasksCfgBuilder) string {
                        fmt.Sprintf("swarm_out_dir=%s", specs.PLACEHOLDER_ISOLATED_OUTDIR),
                },
                Isolate:  "bundle_recipes.isolate",
-               Priority: 0.95,
+               Priority: 0.7,
        })
        return BUNDLE_RECIPES_NAME
 }
@@ -261,6 +264,48 @@ func useBundledRecipes(parts map[string]string) bool {
        return true
 }
 
+type isolateAssetCfg struct {
+       isolateFile string
+       cipdPkg     string
+}
+
+var ISOLATE_ASSET_MAPPING = map[string]isolateAssetCfg{
+       ISOLATE_SKIMAGE_NAME: {
+               isolateFile: "isolate_skimage.isolate",
+               cipdPkg:     "skimage",
+       },
+       ISOLATE_SKP_NAME: {
+               isolateFile: "isolate_skp.isolate",
+               cipdPkg:     "skp",
+       },
+       ISOLATE_SVG_NAME: {
+               isolateFile: "isolate_svg.isolate",
+               cipdPkg:     "svg",
+       },
+}
+
+// bundleRecipes generates the task to bundle and isolate the recipes.
+func isolateCIPDAsset(b *specs.TasksCfgBuilder, name string) string {
+       b.MustAddTask(name, &specs.TaskSpec{
+               CipdPackages: []*specs.CipdPackage{
+                       b.MustGetCipdPackageFromAsset(ISOLATE_ASSET_MAPPING[name].cipdPkg),
+               },
+               Dimensions: linuxGceDimensions(),
+               Isolate:    ISOLATE_ASSET_MAPPING[name].isolateFile,
+               Priority:   0.7,
+       })
+       return name
+}
+
+// useIsolatedCIPD returns true iff the given bot should isolate the CIPD assets
+// to save time on I/O bound bots, like the RPIs
+func useIsolatedCIPD(parts map[string]string) bool {
+       // Only do this on the RPIs for now. Other, faster machines shouldn't see much
+       // benefit and we don't need the extra complexity, for now
+       rpiOS := []string{"Android", "Chromecast", "ChromeOS", "iOS"}
+       return util.In(parts["os"], rpiOS)
+}
+
 // compile generates a compile task. Returns the name of the last task in the
 // generated chain of tasks, which the Job should add as a dependency.
 func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) string {
@@ -482,6 +527,11 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
                        s.Isolate = "test_skia_bundled_unix.isolate"
                }
        }
+       if useIsolatedCIPD(parts) {
+               s.Dependencies = append(s.Dependencies, ISOLATE_SKP_NAME)
+               s.Dependencies = append(s.Dependencies, ISOLATE_SVG_NAME)
+               s.Dependencies = append(s.Dependencies, ISOLATE_SKIMAGE_NAME)
+       }
        if strings.Contains(parts["extra_config"], "Valgrind") {
                s.ExecutionTimeout = 9 * time.Hour
                s.Expiration = 48 * time.Hour
@@ -608,6 +658,12 @@ func process(b *specs.TasksCfgBuilder, name string) {
                deps = append(deps, bundleRecipes(b))
        }
 
+       // Isolate CIPD assets.
+       fmt.Println(name)
+       if _, ok := ISOLATE_ASSET_MAPPING[name]; ok {
+               deps = append(deps, isolateCIPDAsset(b, name))
+       }
+
        parts, err := jobNameSchema.ParseJobName(name)
        if err != nil {
                glog.Fatal(err)
@@ -654,10 +710,15 @@ func process(b *specs.TasksCfgBuilder, name string) {
        }
 
        // Common assets needed by the remaining bots.
-       pkgs := []*specs.CipdPackage{
-               b.MustGetCipdPackageFromAsset("skimage"),
-               b.MustGetCipdPackageFromAsset("skp"),
-               b.MustGetCipdPackageFromAsset("svg"),
+
+       pkgs := []*specs.CipdPackage{}
+
+       if !useIsolatedCIPD(parts) {
+               pkgs = []*specs.CipdPackage{
+                       b.MustGetCipdPackageFromAsset("skimage"),
+                       b.MustGetCipdPackageFromAsset("skp"),
+                       b.MustGetCipdPackageFromAsset("svg"),
+               }
        }
        if strings.Contains(name, "Chromecast") {
                // Chromecasts don't have enough disk space to fit all of the content,

diff --git a/infra/bots/isolate_skimage.isolate b/infra/bots/isolate_skimage.isolate
new file mode 100644 (file)
index 0000000..36066be
--- /dev/null
+++ b/infra/bots/isolate_skimage.isolate
@@ -0,0 +1,7 @@
+{
+  'variables': {
+    'command': [
+      '/bin/cp', '-rL', 'skimage', '${ISOLATED_OUTDIR}',
+    ],
+  },
+}

diff --git a/infra/bots/isolate_skp.isolate b/infra/bots/isolate_skp.isolate
new file mode 100644 (file)
index 0000000..d632dff
--- /dev/null
+++ b/infra/bots/isolate_skp.isolate
@@ -0,0 +1,7 @@
+{
+  'variables': {
+    'command': [
+      '/bin/cp', '-rL', 'skp', '${ISOLATED_OUTDIR}',
+    ],
+  },
+}

diff --git a/infra/bots/isolate_svg.isolate b/infra/bots/isolate_svg.isolate
new file mode 100644 (file)
index 0000000..e04c4e3
--- /dev/null
+++ b/infra/bots/isolate_svg.isolate
@@ -0,0 +1,7 @@
+{
+  'variables': {
+    'command': [
+      '/bin/cp', '-rL', 'svg', '${ISOLATED_OUTDIR}',
+    ],
+  },
+}

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index be765d0..b3c85e0 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -77,6 +77,9 @@
   "Housekeeper-PerCommit",
   "Housekeeper-PerCommit-BundleRecipes",
   "Housekeeper-PerCommit-InfraTests",
+  "Housekeeper-PerCommit-IsolateSkImage",
+  "Housekeeper-PerCommit-IsolateSKP",
+  "Housekeeper-PerCommit-IsolateSVG",
   "Housekeeper-Weekly-RecreateSKPs",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 5bc4975..1441406 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -469,6 +469,24 @@
         "Housekeeper-PerCommit-InfraTests"
       ]
     },
+    "Housekeeper-PerCommit-IsolateSKP": {
+      "priority": 0.8,
+      "tasks": [
+        "Housekeeper-PerCommit-IsolateSKP"
+      ]
+    },
+    "Housekeeper-PerCommit-IsolateSVG": {
+      "priority": 0.8,
+      "tasks": [
+        "Housekeeper-PerCommit-IsolateSVG"
+      ]
+    },
+    "Housekeeper-PerCommit-IsolateSkImage": {
+      "priority": 0.8,
+      "tasks": [
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ]
+    },
     "Housekeeper-Weekly-RecreateSKPs": {
       "priority": 0.8,
       "tasks": [
@@ -4433,7 +4451,7 @@
         "swarm_out_dir=${ISOLATED_OUTDIR}"
       ],
       "isolate": "bundle_recipes.isolate",
-      "priority": 0.95
+      "priority": 0.7
     },
     "Housekeeper-PerCommit-InfraTests": {
       "cipd_packages": [
@@ -4465,6 +4483,57 @@
       "isolate": "infra_skia.isolate",
       "priority": 0.8
     },
+    "Housekeeper-PerCommit-IsolateSKP": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:56"
+        }
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "isolate": "isolate_skp.isolate",
+      "priority": 0.7
+    },
+    "Housekeeper-PerCommit-IsolateSVG": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "isolate": "isolate_svg.isolate",
+      "priority": 0.7
+    },
+    "Housekeeper-PerCommit-IsolateSkImage": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:24"
+        }
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "isolate": "isolate_skimage.isolate",
+      "priority": 0.7
+    },
     "Housekeeper-Weekly-RecreateSKPs": {
       "cipd_packages": [
         {
@@ -4498,23 +4567,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4546,23 +4598,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4594,23 +4629,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4642,23 +4660,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4690,23 +4691,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4738,23 +4722,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4786,23 +4753,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4834,23 +4784,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4882,23 +4815,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4930,23 +4846,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -4978,23 +4877,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5026,23 +4908,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5074,23 +4939,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5122,23 +4970,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5170,23 +5001,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5218,23 +5032,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5266,23 +5063,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5314,23 +5094,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5362,23 +5125,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5410,23 +5156,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5458,23 +5187,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5506,23 +5218,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5554,23 +5249,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5602,23 +5280,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5650,23 +5311,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5698,23 +5342,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5746,23 +5373,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5794,23 +5404,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5842,23 +5435,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5890,23 +5466,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5938,23 +5497,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -5986,23 +5528,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6034,23 +5559,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6082,23 +5590,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6130,23 +5621,6 @@
       "priority": 0.8
     },
     "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6254,23 +5728,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6301,23 +5758,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6348,23 +5788,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6395,23 +5818,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6442,23 +5848,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6489,23 +5878,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6536,23 +5908,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -6583,23 +5938,6 @@
       "priority": 0.8
     },
     "Perf-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -10861,23 +10199,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -10908,23 +10229,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -10955,23 +10259,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11003,23 +10290,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11051,23 +10321,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11099,23 +10352,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11147,23 +10383,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11195,23 +10414,6 @@
       "priority": 0.8
     },
     "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes"
@@ -11243,26 +10445,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -11291,26 +10479,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -11339,26 +10513,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-mipsel-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -11387,26 +10547,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-mipsel-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -11435,26 +10581,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:MMB29K",
@@ -11483,26 +10615,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:MMB29K",
@@ -11531,26 +10649,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M_G930AUCS4BQC2",
@@ -11579,26 +10683,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M_G930AUCS4BQC2",
@@ -11627,26 +10717,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M_G930FXXU1DQAS",
@@ -11675,26 +10751,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M_G930FXXU1DQAS",
@@ -11723,26 +10785,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NPJ25.93-14",
@@ -11771,26 +10819,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NPJ25.93-14",
@@ -11819,26 +10853,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -11867,26 +10887,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -11915,26 +10921,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -11963,26 +10955,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NRD90M",
@@ -12011,26 +10989,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -12059,26 +11023,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -12107,26 +11057,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -12155,26 +11091,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -12203,26 +11125,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:M4B30Z",
@@ -12251,26 +11159,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:M4B30Z",
@@ -12299,26 +11193,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12347,26 +11227,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12395,26 +11261,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12443,26 +11295,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12491,26 +11329,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -12539,26 +11363,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -12587,26 +11397,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12635,26 +11431,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12683,26 +11465,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12731,26 +11499,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12779,26 +11533,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12827,26 +11567,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-x86-Release-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:OPP1.170223.012",
@@ -12875,26 +11601,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:N2G47D",
@@ -12923,26 +11635,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:N2G47D",
@@ -12971,26 +11669,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NMF26Q",
@@ -13019,26 +11703,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NMF26Q",
@@ -13067,26 +11737,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NMF26Q",
@@ -13115,26 +11771,12 @@
       "priority": 0.8
     },
     "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device_os:NMF26Q",
@@ -13163,26 +11805,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT604",
@@ -13207,29 +11835,15 @@
       "io_timeout_ns": 2400000000000,
       "isolate": "test_skia_bundled_unix.isolate",
       "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
+      "priority": 0.8
+    },
+    "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release": {
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT604",
@@ -13257,26 +11871,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT860",
@@ -13304,26 +11904,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT860",
@@ -13351,26 +11937,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT764",
@@ -13398,26 +11970,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:MaliT764",
@@ -13445,26 +12003,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:TegraK1",
@@ -13492,26 +12036,12 @@
       "priority": 0.8
     },
     "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "gpu:TegraK1",
@@ -18347,26 +16877,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -18394,26 +16910,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -18441,26 +16943,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPad6,3",
@@ -18489,26 +16977,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPad6,3",
@@ -18537,26 +17011,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPhone7,2",
@@ -18585,26 +17045,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPhone7,2",
@@ -18633,26 +17079,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPhone9,1",
@@ -18681,26 +17113,12 @@
       "priority": 0.8
     },
     "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:24"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:56"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
         "device:iPhone9,1",