diff options
Diffstat (limited to 'infra/bots/gen_tasks.go')
| -rw-r--r-- | infra/bots/gen_tasks.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 71a53a2a97..0301034cbd 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -244,13 +244,6 @@ 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 { @@ -484,7 +477,7 @@ func test(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil MaxAttempts: 1, Priority: 0.8, } - if useBundledRecipes(parts) { + if parts["os"] == "Android" { s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME) s.Isolate = "test_skia_bundled.isolate" } @@ -534,10 +527,10 @@ 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 useBundledRecipes(parts) { + if parts["os"] == "Android" { isolate = "skpbench_skia_bundled.isolate" } - } else if useBundledRecipes(parts) { + } else if parts["os"] == "Android" { isolate = "perf_skia_bundled.isolate" } s := &specs.TaskSpec{ @@ -565,7 +558,7 @@ func perf(b *specs.TasksCfgBuilder, name string, parts map[string]string, compil MaxAttempts: 1, Priority: 0.8, } - if useBundledRecipes(parts) { + if parts["os"] == "Android" { s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME) } if strings.Contains(parts["extra_config"], "Valgrind") { |