Reland: Use bundled recipes for all test/perf tasks

It won't save as much time for faster machines, but it should still shave a few seconds, and it'll be nice to be consistent. Bug: skia: Change-Id: I0b2aa010579b527c66325cb5b691bfb549b31316 Reviewed-on: https://skia-review.googlesource.com/11418 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2017-04-07 08:31:22 -04:00 · 2017-04-07 08:31:22 -04:00 · 23a6ec6eb3
commit 23a6ec6eb3
parent 5f055f0fe9
38 changed files with 660 additions and 436 deletions
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@ -244,6 +244,13 @@ func bundleRecipes(b *specs.TasksCfgBuilder) string {
 	return BUNDLE_RECIPES_NAME
 }

+// useBundledRecipes returns true iff the given bot should use bundled recipes
+// instead of syncing recipe DEPS itself.
+func useBundledRecipes(parts map[string]string) bool {
+	// Use bundled recipes for all test/perf tasks.
+	return true
+}
+
 // 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 {
@ -477,9 +484,13 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
 		MaxAttempts: 1,
 		Priority:    0.8,
 	}
-	if parts["os"] == "Android" {
+	if useBundledRecipes(parts) {
 		s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME)
-		s.Isolate = "test_skia_bundled.isolate"
+		if strings.Contains(parts["os"], "Win") {
+			s.Isolate = "test_skia_bundled_win.isolate"
+		} else {
+			s.Isolate = "test_skia_bundled_unix.isolate"
+		}
 	}
 	if strings.Contains(parts["extra_config"], "Valgrind") {
 		s.ExecutionTimeout = 9 * time.Hour
@ -527,11 +538,19 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
 	if strings.Contains(parts["extra_config"], "Skpbench") {
 		recipe = "swarm_skpbench"
 		isolate = "skpbench_skia.isolate"
-		if parts["os"] == "Android" {
-			isolate = "skpbench_skia_bundled.isolate"
+		if useBundledRecipes(parts) {
+			if strings.Contains(parts["os"], "Win") {
+				isolate = "skpbench_skia_bundled_win.isolate"
+			} else {
+				isolate = "skpbench_skia_bundled_unix.isolate"
+			}
+		}
+	} else if useBundledRecipes(parts) {
+		if strings.Contains(parts["os"], "Win") {
+			isolate = "perf_skia_bundled_win.isolate"
+		} else {
+			isolate = "perf_skia_bundled_unix.isolate"
 		}
-	} else if parts["os"] == "Android" {
-		isolate = "perf_skia_bundled.isolate"
 	}
 	s := &specs.TaskSpec{
 		CipdPackages:     pkgs,
@ -558,7 +577,7 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil
 		MaxAttempts: 1,
 		Priority:    0.8,
 	}
-	if parts["os"] == "Android" {
+	if useBundledRecipes(parts) {
 		s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME)
 	}
 	if strings.Contains(parts["extra_config"], "Valgrind") {
--- a/infra/bots/perf_skia_bundled.isolate
+++ b/infra/bots/perf_skia_bundled.isolate
@ -4,7 +4,6 @@
    'assets.isolate',
    'ios_bin.isolate',
    'resources.isolate',
-    'swarm_recipe_bundled.isolate',
  ],
  'variables': {
    'files': [
--- a/infra/bots/perf_skia_bundled_unix.isolate
+++ b/infra/bots/perf_skia_bundled_unix.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'perf_skia_bundled.isolate',
+    'swarm_recipe_bundled_unix.isolate',
+  ],
+}
--- a/infra/bots/perf_skia_bundled_win.isolate
+++ b/infra/bots/perf_skia_bundled_win.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'perf_skia_bundled.isolate',
+    'swarm_recipe_bundled_win.isolate',
+  ],
+}
--- a/infra/bots/recipe_modules/flavor/api.py
+++ b/infra/bots/recipe_modules/flavor/api.py
@ -58,21 +58,21 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
  def get_flavor(self, builder_cfg):
    """Return a flavor utils object specific to the given builder."""
    if is_flutter(builder_cfg):
-      return flutter_flavor.FlutterFlavorUtils(self.m)
+      return flutter_flavor.FlutterFlavorUtils(self)
    if is_chromecast(builder_cfg):
-      return gn_chromecast_flavor.GNChromecastFlavorUtils(self.m)
+      return gn_chromecast_flavor.GNChromecastFlavorUtils(self)
    if is_chromebook(builder_cfg):
-      return gn_chromebook_flavor.GNChromebookFlavorUtils(self.m)
+      return gn_chromebook_flavor.GNChromebookFlavorUtils(self)
    if is_android(builder_cfg):
-      return gn_android_flavor.GNAndroidFlavorUtils(self.m)
+      return gn_android_flavor.GNAndroidFlavorUtils(self)
    elif is_ios(builder_cfg):
-      return ios_flavor.iOSFlavorUtils(self.m)
+      return ios_flavor.iOSFlavorUtils(self)
    elif is_pdfium(builder_cfg):
-      return pdfium_flavor.PDFiumFlavorUtils(self.m)
+      return pdfium_flavor.PDFiumFlavorUtils(self)
    elif is_valgrind(builder_cfg):
-      return valgrind_flavor.ValgrindFlavorUtils(self.m)
+      return valgrind_flavor.ValgrindFlavorUtils(self)
    else:
-      return gn_flavor.GNFlavorUtils(self.m)
+      return gn_flavor.GNFlavorUtils(self)

  def setup(self):
    self._f = self.get_flavor(self.m.vars.builder_cfg)
--- a/infra/bots/recipe_modules/flavor/default_flavor.py
+++ b/infra/bots/recipe_modules/flavor/default_flavor.py
@ -75,8 +75,15 @@ class DefaultFlavorUtils(object):
  copying files between the host and Android device, as well as the
  'step' function, so that commands may be run through ADB.
  """
-  def __init__(self, m):
-    self.m = m
+  def __init__(self, module):
+    # Store a pointer to the parent recipe module (SkiaFlavorApi) so that
+    # FlavorUtils objects can do recipe module-like things, like run steps or
+    # access module-level resources.
+    self.module = module
+
+    # self.m is just a shortcut so that FlavorUtils objects can use the same
+    # syntax as regular recipe modules to run steps, eg: self.m.step(...)
+    self.m = module.m
    self._chrome_path = None
    self._win_toolchain_dir = self.m.vars.slave_dir.join(WIN_TOOLCHAIN_DIR)
    win_toolchain_asset_path = self.m.vars.infrabots_dir.join(
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@ -170,8 +170,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
      args = [self.m.vars.slave_dir] + [str(x) for x in cmd]
      with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}):
        self._py('symbolized %s' % name,
-                 self.m.vars.infrabots_dir.join('recipe_modules', 'core',
-                 'resources', 'symbolize_stack_trace.py'),
+                 self.module.resource('symbolize_stack_trace.py'),
                 args=args,
                 infra_step=False)

--- a/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py
+++ b/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
@ -106,7 +106,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Release/nanobench",
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
@ -106,7 +106,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Release/nanobench",
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@ -69,7 +69,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/nanobench",
      "--undefok",
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@ -106,7 +106,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Release/nanobench",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@ -69,7 +69,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@ -69,7 +69,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Release/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@ -69,7 +69,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Release/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Release/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "[START_DIR]/out/Debug/dm",
      "--undefok",
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@ -206,7 +206,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
+++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
@ -121,4 +121,4 @@
    "recipe_result": null,
    "status_code": 0
  }
-]
+]
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
@ -106,7 +106,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Release/nanobench",
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@ -178,7 +178,7 @@
    "cmd": [
      "python",
      "-u",
-      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
+      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
      "[START_DIR]",
      "catchsegv",
      "[START_DIR]/out/Debug/dm",
--- a/infra/bots/skpbench_skia_bundled.isolate
+++ b/infra/bots/skpbench_skia_bundled.isolate
@ -1,7 +1,6 @@
 {
  'includes': [
    'assets.isolate',
-    'swarm_recipe_bundled.isolate',
  ],
  'variables': {
    'files': [
--- a/infra/bots/skpbench_skia_bundled_unix.isolate
+++ b/infra/bots/skpbench_skia_bundled_unix.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'skpbench_skia_bundled.isolate',
+    'swarm_recipe_bundled_unix.isolate',
+  ],
+}
--- a/infra/bots/skpbench_skia_bundled_win.isolate
+++ b/infra/bots/skpbench_skia_bundled_win.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'skpbench_skia_bundled.isolate',
+    'swarm_recipe_bundled_win.isolate',
+  ],
+}
--- a/infra/bots/swarm_recipe_bundled_unix.isolate
+++ b/infra/bots/swarm_recipe_bundled_unix.isolate
--- a/infra/bots/swarm_recipe_bundled_win.isolate
+++ b/infra/bots/swarm_recipe_bundled_win.isolate
@ -0,0 +1,7 @@
+{
+  'variables': {
+    'command': [
+      '../../../recipe_bundle/recipes.bat', 'run', '--timestamps',
+    ],
+  },
+}
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
--- a/infra/bots/test_skia_bundled.isolate
+++ b/infra/bots/test_skia_bundled.isolate
@ -4,7 +4,6 @@
    'assets.isolate',
    'ios_bin.isolate',
    'resources.isolate',
-    'swarm_recipe_bundled.isolate',
  ],
  'variables': {
    'files': [
--- a/infra/bots/test_skia_bundled_unix.isolate
+++ b/infra/bots/test_skia_bundled_unix.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'test_skia_bundled.isolate',
+    'swarm_recipe_bundled_unix.isolate',
+  ],
+}
--- a/infra/bots/test_skia_bundled_win.isolate
+++ b/infra/bots/test_skia_bundled_win.isolate
@ -0,0 +1,6 @@
+{
+  'includes': [
+    'test_skia_bundled.isolate',
+    'swarm_recipe_bundled_win.isolate',
+  ],
+}