From c062b6be5a01b3f4845c64181b1588d03c02d1e1 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 24 Jul 2018 17:10:46 -0400 Subject: [infra] Adjust job priorities. (skia) After https://skia-review.googlesource.com/c/buildbot/+/141564, scheduling will work better if most jobs use the default priority. Since task priority is now ignored, remove it everywhere. Bug: skia:8145 Change-Id: Ie49cfbbbda80c6d6419a8f691af6a3c775ae5cda Reviewed-on: https://skia-review.googlesource.com/143163 Auto-Submit: Ben Wagner Reviewed-by: Eric Boren Commit-Queue: Eric Boren --- infra/bots/gen_tasks.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'infra/bots/gen_tasks.go') diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 31bd5b8141..f3458ac53d 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -303,7 +303,6 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri }, Isolate: relpath(isolate), Outputs: outputs, - Priority: 0.8, ServiceAccount: serviceAccount, } timeout(task, time.Hour) @@ -644,8 +643,7 @@ func bundleRecipes(b *specs.TasksCfgBuilder) string { EnvPrefixes: map[string][]string{ "PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"}, }, - Isolate: relpath("swarm_recipe.isolate"), - Priority: 0.7, + Isolate: relpath("swarm_recipe.isolate"), }) return BUNDLE_RECIPES_NAME } @@ -704,7 +702,6 @@ func isolateCIPDAsset(b *specs.TasksCfgBuilder, name string) string { Command: []string{"/bin/cp", "-rL", asset.path, "${ISOLATED_OUTDIR}"}, Dimensions: linuxGceDimensions(MACHINE_TYPE_SMALL), Isolate: relpath("empty.isolate"), - Priority: 0.7, }) return name } @@ -1188,6 +1185,7 @@ func presubmit(b *specs.TasksCfgBuilder, name string) string { // process generates tasks and jobs for the given job name. func process(b *specs.TasksCfgBuilder, name string) { + var priority float64 // Leave as default for most jobs. deps := []string{} // Bundle Recipes. @@ -1266,6 +1264,7 @@ func process(b *specs.TasksCfgBuilder, name string) { deps = append(deps, checkGeneratedFiles(b, name)) } if name == "Housekeeper-OnDemand-Presubmit" { + priority = 1 deps = append(deps, presubmit(b, name)) } if strings.Contains(name, "Bookmaker") { @@ -1331,7 +1330,7 @@ func process(b *specs.TasksCfgBuilder, name string) { // Add the Job spec. j := &specs.JobSpec{ - Priority: 0.8, + Priority: priority, TaskSpecs: deps, Trigger: specs.TRIGGER_ANY_BRANCH, } -- cgit v1.2.3