From e7950e3923deb9064384b474ea09306a5b8147c2 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Thu, 26 Apr 2018 08:49:38 -0400 Subject: [infra] RecreateSKPs and Bookmaker need the Git packages Bug: skia:7833, skia:7050 Change-Id: I8272e4b0beaed2a56260546f4a599a4586c71792 Reviewed-on: https://skia-review.googlesource.com/123921 Reviewed-by: Ravi Mistry Commit-Queue: Eric Boren --- infra/bots/gen_tasks.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'infra/bots/gen_tasks.go') diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index f573e0ecf2..03b14e22ce 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -762,6 +762,7 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str // dependency. func recreateSKPs(b *specs.TasksCfgBuilder, name string) string { task := kitchenTask(name, "recreate_skps", "swarm_recipe.isolate", SERVICE_ACCOUNT_RECREATE_SKPS, linuxGceDimensions(), nil, OUTPUT_NONE) + task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...) task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go")) task.ExecutionTimeout = 4 * time.Hour task.IoTimeout = 4 * time.Hour // With kitchen, step logs don't count toward IoTimeout. @@ -809,6 +810,7 @@ func housekeeper(b *specs.TasksCfgBuilder, name, compileTaskName string) string // in the generated chain of tasks, which the Job should add as a dependency. func bookmaker(b *specs.TasksCfgBuilder, name, compileTaskName string) string { task := kitchenTask(name, "bookmaker", "swarm_recipe.isolate", SERVICE_ACCOUNT_BOOKMAKER, linuxGceDimensions(), nil, OUTPUT_NONE) + task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...) task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go")) task.Dependencies = append(task.Dependencies, compileTaskName) task.ExecutionTimeout = 2 * time.Hour -- cgit v1.2.3