From 8b3f9e64ff6d505036f79aeffd98dea4b648cb46 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 4 Apr 2017 09:06:16 -0400 Subject: Bundle recipes for use on RPi This saves ~1:30 of overhead when the isolate cache is warm. Bug: skia:5813 Change-Id: I5053d66e865ca6500b82567f83be8042568e22cf Reviewed-on: https://skia-review.googlesource.com/11063 Reviewed-by: Kevin Lubick Commit-Queue: Eric Boren --- infra/bots/assets.isolate | 7 + infra/bots/bundle_recipes.isolate | 14 + infra/bots/gen_tasks.go | 44 +++ infra/bots/jobs.json | 1 + infra/bots/perf_skia_bundled.isolate | 14 + infra/bots/recipe_modules/vars/api.py | 1 + .../bundle_recipes.expected/BundleRecipes.json | 110 ++++++ infra/bots/recipes/bundle_recipes.py | 45 +++ infra/bots/skpbench_skia.isolate | 2 +- infra/bots/skpbench_skia_bundled.isolate | 12 + infra/bots/swarm_recipe_bundled.isolate | 7 + infra/bots/tasks.json | 412 +++++++++++++-------- infra/bots/test_skia_bundled.isolate | 14 + 13 files changed, 530 insertions(+), 153 deletions(-) create mode 100644 infra/bots/assets.isolate create mode 100644 infra/bots/bundle_recipes.isolate create mode 100644 infra/bots/perf_skia_bundled.isolate create mode 100644 infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json create mode 100644 infra/bots/recipes/bundle_recipes.py create mode 100644 infra/bots/skpbench_skia_bundled.isolate create mode 100644 infra/bots/swarm_recipe_bundled.isolate create mode 100644 infra/bots/test_skia_bundled.isolate (limited to 'infra') diff --git a/infra/bots/assets.isolate b/infra/bots/assets.isolate new file mode 100644 index 0000000000..1d9ef7a7fc --- /dev/null +++ b/infra/bots/assets.isolate @@ -0,0 +1,7 @@ +{ + 'variables': { + 'files': [ + 'assets/', + ], + }, +} diff --git a/infra/bots/bundle_recipes.isolate b/infra/bots/bundle_recipes.isolate new file mode 100644 index 0000000000..d873fc31db --- /dev/null +++ b/infra/bots/bundle_recipes.isolate @@ -0,0 +1,14 @@ +{ + 'includes': [ + 'infrabots.isolate', + ], + 'variables': { + 'command': [ + 'python', 'recipes.py', 'run', '--timestamps', + ], + 'files': [ + '../../../.gclient', + '../config/recipes.cfg', + ], + }, +} diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 8cbbd8325f..900d5326ce 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -26,6 +26,8 @@ import ( ) const ( + BUNDLE_RECIPES_NAME = "Housekeeper-PerCommit-BundleRecipes" + DEFAULT_OS = DEFAULT_OS_LINUX DEFAULT_OS_LINUX = "Ubuntu-14.04" @@ -214,6 +216,31 @@ func swarmDimensions(parts map[string]string) []string { return rv } +// bundleRecipes generates the task to bundle and isolate the recipes. +func bundleRecipes(b *specs.TasksCfgBuilder) string { + b.MustAddTask(BUNDLE_RECIPES_NAME, &specs.TaskSpec{ + CipdPackages: []*specs.CipdPackage{}, + Dimensions: linuxGceDimensions(), + ExtraArgs: []string{ + "--workdir", "../../..", "bundle_recipes", + fmt.Sprintf("repository=%s", specs.PLACEHOLDER_REPO), + fmt.Sprintf("buildername=%s", BUNDLE_RECIPES_NAME), + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + fmt.Sprintf("swarm_out_dir=%s", specs.PLACEHOLDER_ISOLATED_OUTDIR), + fmt.Sprintf("revision=%s", specs.PLACEHOLDER_REVISION), + fmt.Sprintf("patch_storage=%s", specs.PLACEHOLDER_PATCH_STORAGE), + fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE), + fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET), + }, + Isolate: "bundle_recipes.isolate", + Priority: 0.95, + }) + return BUNDLE_RECIPES_NAME +} + // 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 { @@ -441,6 +468,10 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil MaxAttempts: 1, Priority: 0.8, } + if parts["os"] == "Android" { + s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME) + s.Isolate = "test_skia_bundled.isolate" + } if strings.Contains(parts["extra_config"], "Valgrind") { s.ExecutionTimeout = 9 * time.Hour s.Expiration = 48 * time.Hour @@ -487,6 +518,11 @@ 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" + } + } else if parts["os"] == "Android" { + isolate = "perf_skia_bundled.isolate" } s := &specs.TaskSpec{ CipdPackages: pkgs, @@ -513,6 +549,9 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil MaxAttempts: 1, Priority: 0.8, } + if parts["os"] == "Android" { + s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME) + } if strings.Contains(parts["extra_config"], "Valgrind") { s.ExecutionTimeout = 9 * time.Hour s.Expiration = 48 * time.Hour @@ -555,6 +594,11 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil func process(b *specs.TasksCfgBuilder, name string) { deps := []string{} + // Bundle Recipes. + if name == BUNDLE_RECIPES_NAME { + deps = append(deps, bundleRecipes(b)) + } + parts, err := jobNameSchema.ParseJobName(name) if err != nil { glog.Fatal(err) diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 1613ec20da..40992762ca 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -70,6 +70,7 @@ "Build-Win-MSVC-x86_64-Release-Vulkan", "Housekeeper-Nightly-RecreateSKPs_Canary", "Housekeeper-PerCommit", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-InfraTests", "Housekeeper-Weekly-RecreateSKPs", "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android", diff --git a/infra/bots/perf_skia_bundled.isolate b/infra/bots/perf_skia_bundled.isolate new file mode 100644 index 0000000000..cd478385df --- /dev/null +++ b/infra/bots/perf_skia_bundled.isolate @@ -0,0 +1,14 @@ +{ + 'includes': [ + 'android_bin.isolate', + 'assets.isolate', + 'ios_bin.isolate', + 'resources.isolate', + 'swarm_recipe_bundled.isolate', + ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, +} diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 63e3e4f748..9d88821be9 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -57,6 +57,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): '-CT_' in self.builder_name or 'Presubmit' in self.builder_name or 'InfraTests' in self.builder_name or + 'BundleRecipes' in self.builder_name or self.builder_name == "Housekeeper-PerCommit") if self.persistent_checkout: if 'Win' in self.builder_name: diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json new file mode 100644 index 0000000000..a4c191417a --- /dev/null +++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json @@ -0,0 +1,110 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_/_B_WORK]", + "511" + ], + "infra_step": true, + "name": "makedirs checkout_path", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", + "--revision", + "skia@abc123", + "--output_manifest" + ], + "cwd": "[CUSTOM_/_B_WORK]", + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "infra_step": true, + "name": "bot_update", + "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", + "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" + ] + }, + { + "cmd": [ + "python", + "[CUSTOM_/_B_WORK]/skia/infra/bots/recipes.py", + "bundle" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, + "infra_step": true, + "name": "Bundle Recipes" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "[START_DIR]/bundle", + "[CUSTOM_[SWARM_OUT_DIR]]/recipe_bundle", + "0" + ], + "name": "Copy Recipe Bundle" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +] \ No newline at end of file diff --git a/infra/bots/recipes/bundle_recipes.py b/infra/bots/recipes/bundle_recipes.py new file mode 100644 index 0000000000..8a16874f50 --- /dev/null +++ b/infra/bots/recipes/bundle_recipes.py @@ -0,0 +1,45 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +# Recipe module for Skia Swarming compile. + + +DEPS = [ + 'recipe_engine/path', + 'recipe_engine/properties', + 'recipe_engine/shutil', + 'recipe_engine/step', + 'core', + 'run', + 'vars', +] + + +def RunSteps(api): + api.core.setup() + recipes_py = api.vars.infrabots_dir.join('recipes.py') + api.run(api.step, 'Bundle Recipes', infra_step=True, + cmd=['python', recipes_py, 'bundle']) + src_dir = api.path['start_dir'].join('bundle') + dst_dir = api.vars.swarming_out_dir.join('recipe_bundle') + api.shutil.copytree('Copy Recipe Bundle', src_dir, dst_dir) + api.run.check_failure() + + +def GenTests(api): + yield ( + api.test('BundleRecipes') + + api.properties(buildername='Housekeeper-PerCommit-BundleRecipes', + mastername='fake-master', + slavename='fake-slave', + buildnumber=5, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.path.exists( + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') + ) + ) diff --git a/infra/bots/skpbench_skia.isolate b/infra/bots/skpbench_skia.isolate index f506012e35..008aaa755c 100644 --- a/infra/bots/skpbench_skia.isolate +++ b/infra/bots/skpbench_skia.isolate @@ -8,4 +8,4 @@ '../../tools/skpbench/', ], }, - } \ No newline at end of file +} \ No newline at end of file diff --git a/infra/bots/skpbench_skia_bundled.isolate b/infra/bots/skpbench_skia_bundled.isolate new file mode 100644 index 0000000000..573e784953 --- /dev/null +++ b/infra/bots/skpbench_skia_bundled.isolate @@ -0,0 +1,12 @@ +{ + 'includes': [ + 'assets.isolate', + 'swarm_recipe_bundled.isolate', + ], + 'variables': { + 'files': [ + '../../../.gclient', + '../../tools/skpbench/', + ], + }, +} diff --git a/infra/bots/swarm_recipe_bundled.isolate b/infra/bots/swarm_recipe_bundled.isolate new file mode 100644 index 0000000000..731b369d87 --- /dev/null +++ b/infra/bots/swarm_recipe_bundled.isolate @@ -0,0 +1,7 @@ +{ + 'variables': { + 'command': [ + '../../../recipe_bundle/recipes', 'run', '--timestamps', + ], + }, +} diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 8d59275163..734274193f 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -427,6 +427,12 @@ "Housekeeper-PerCommit" ] }, + "Housekeeper-PerCommit-BundleRecipes": { + "priority": 0.8, + "tasks": [ + "Housekeeper-PerCommit-BundleRecipes" + ] + }, "Housekeeper-PerCommit-InfraTests": { "priority": 0.8, "tasks": [ @@ -4064,6 +4070,32 @@ "isolate": "housekeeper_skia.isolate", "priority": 0.8 }, + "Housekeeper-PerCommit-BundleRecipes": { + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "bundle_recipes", + "repository=<(REPO)", + "buildername=Housekeeper-PerCommit-BundleRecipes", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "bundle_recipes.isolate", + "priority": 0.95 + }, "Housekeeper-PerCommit-InfraTests": { "dimensions": [ "cpu:x86-64-avx2", @@ -4137,7 +4169,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MOB30Q", @@ -4164,7 +4197,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4187,7 +4220,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MOB30Q", @@ -4214,7 +4248,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4237,7 +4271,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MMB29K", @@ -4264,7 +4299,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4287,7 +4322,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MMB29K", @@ -4314,7 +4350,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4337,7 +4373,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930AUCS4BQC2", @@ -4364,7 +4401,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4387,7 +4424,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930AUCS4BQC2", @@ -4414,7 +4452,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4437,7 +4475,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930FXXU1DQAS", @@ -4464,7 +4503,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4487,7 +4526,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930FXXU1DQAS", @@ -4514,7 +4554,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4537,7 +4577,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MPJ24.139-64", @@ -4564,7 +4605,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4587,7 +4628,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MPJ24.139-64", @@ -4614,7 +4656,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4637,7 +4679,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -4664,7 +4707,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4687,7 +4730,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -4714,7 +4758,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4737,7 +4781,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -4764,7 +4809,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4787,7 +4832,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -4814,7 +4860,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4837,7 +4883,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -4864,7 +4911,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4887,7 +4934,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -4914,7 +4962,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4937,7 +4985,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -4964,7 +5013,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -4987,7 +5036,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -5014,7 +5064,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5037,7 +5087,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:M4B30Z", @@ -5064,7 +5115,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5087,7 +5138,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:M4B30Z", @@ -5114,7 +5166,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5137,7 +5189,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -5164,7 +5217,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5187,7 +5240,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -5214,7 +5268,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5237,7 +5291,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -5264,7 +5319,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5287,7 +5342,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -5314,7 +5370,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5337,7 +5393,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY47V", @@ -5364,7 +5421,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5387,7 +5444,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY47V", @@ -5414,7 +5472,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5437,7 +5495,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Debug-Android" + "Build-Ubuntu-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -5464,7 +5523,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5487,7 +5546,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Debug-Android" + "Build-Ubuntu-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -5514,7 +5574,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5537,7 +5597,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Release-Android" + "Build-Ubuntu-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -5564,7 +5625,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5587,7 +5648,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -5614,7 +5676,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5637,7 +5699,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -5664,7 +5727,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5687,7 +5750,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -5714,7 +5778,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5737,7 +5801,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -5764,7 +5829,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5787,7 +5852,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -5814,7 +5880,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5837,7 +5903,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -5864,7 +5931,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", + "isolate": "perf_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5877,7 +5944,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -5904,7 +5972,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "skpbench_skia.isolate", + "isolate": "skpbench_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -5917,7 +5985,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -5944,7 +6013,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "skpbench_skia.isolate", + "isolate": "skpbench_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -9928,7 +9997,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MOB30Q", @@ -9955,7 +10025,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -9978,7 +10048,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MOB30Q", @@ -10005,7 +10076,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10028,7 +10099,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MMB29K", @@ -10055,7 +10127,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10078,7 +10150,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MMB29K", @@ -10105,7 +10178,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10128,7 +10201,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930AUCS4BQC2", @@ -10155,7 +10229,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10178,7 +10252,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930AUCS4BQC2", @@ -10205,7 +10280,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10228,7 +10303,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930FXXU1DQAS", @@ -10255,7 +10331,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10278,7 +10354,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M_G930FXXU1DQAS", @@ -10305,7 +10382,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10328,7 +10405,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:JDQ39", @@ -10355,7 +10433,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10378,7 +10456,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MPJ24.139-64", @@ -10405,7 +10484,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10428,7 +10507,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:MPJ24.139-64", @@ -10455,7 +10535,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10478,7 +10558,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -10505,7 +10586,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10528,7 +10609,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -10555,7 +10637,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10578,7 +10660,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -10605,7 +10688,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10628,7 +10711,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NRD90M", @@ -10655,7 +10739,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10678,7 +10762,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -10705,7 +10790,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10728,7 +10813,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -10755,7 +10841,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10778,7 +10864,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -10805,7 +10892,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10828,7 +10915,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY49J", @@ -10855,7 +10943,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10878,7 +10966,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:M4B30Z", @@ -10905,7 +10994,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10928,7 +11017,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:M4B30Z", @@ -10955,7 +11045,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -10978,7 +11068,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -11005,7 +11096,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11028,7 +11119,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -11055,7 +11147,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11078,7 +11170,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -11105,7 +11198,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11128,7 +11221,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26C", @@ -11155,7 +11249,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11178,7 +11272,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Debug-Android" + "Build-Ubuntu-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY47V", @@ -11205,7 +11300,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11228,7 +11323,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm-Release-Android" + "Build-Ubuntu-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:LMY47V", @@ -11255,7 +11351,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11278,7 +11374,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Debug-Android" + "Build-Ubuntu-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11305,7 +11402,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11328,7 +11425,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Release-Android" + "Build-Ubuntu-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11355,7 +11453,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11378,7 +11476,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Debug-Android" + "Build-Ubuntu-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11405,7 +11504,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11428,7 +11527,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11455,7 +11555,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11478,7 +11578,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Release-Android" + "Build-Ubuntu-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11505,7 +11606,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11528,7 +11629,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-x86-Release-Android_Vulkan" + "Build-Ubuntu-Clang-x86-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:N2G10B", @@ -11555,7 +11657,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11578,7 +11680,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -11605,7 +11708,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11628,7 +11731,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26H", @@ -11655,7 +11759,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11678,7 +11782,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android" + "Build-Ubuntu-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -11705,7 +11810,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11728,7 +11833,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -11755,7 +11861,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11778,7 +11884,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android" + "Build-Ubuntu-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -11805,7 +11912,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, @@ -11828,7 +11935,8 @@ } ], "dependencies": [ - "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan" + "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "device_os:NMF26Q", @@ -11855,7 +11963,7 @@ "patch_set=<(PATCHSET)" ], "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", + "isolate": "test_skia_bundled.isolate", "max_attempts": 1, "priority": 0.8 }, diff --git a/infra/bots/test_skia_bundled.isolate b/infra/bots/test_skia_bundled.isolate new file mode 100644 index 0000000000..cd478385df --- /dev/null +++ b/infra/bots/test_skia_bundled.isolate @@ -0,0 +1,14 @@ +{ + 'includes': [ + 'android_bin.isolate', + 'assets.isolate', + 'ios_bin.isolate', + 'resources.isolate', + 'swarm_recipe_bundled.isolate', + ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, +} -- cgit v1.2.3