From 112ef919821fb1d8b289f9cf84a097d7b08ef058 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Mon, 15 Jan 2018 10:51:06 -0500 Subject: [PATCH] jjb: lava: schedule canary jobs last Canary job are of lesser importance as they used to confirm the health of Jenkins-Lava pipeline. We schedule them last so we can get the active branches to run first and get test results of interest quicker. Signed-off-by: Francis Deslauriers --- scripts/system-tests/system-trigger.groovy | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy index c1b14b9..6eb637b 100644 --- a/scripts/system-tests/system-trigger.groovy +++ b/scripts/system-tests/system-trigger.groovy @@ -458,18 +458,6 @@ if (triggerJobName.contains("vm_tests")) { jobType = 'baremetal_benchmarks'; } -// Launch canary jobs. -println("\nSchedule canary jobs once a day:") -canaryRunConfigs.each { config -> - def jobName = jobType + '_canary'; - def currBuild = LaunchJob(jobName, config); - - // LaunchJob will return null if the job doesn't exist or is disabled. - if (currBuild != null) { - ongoingBuild[jobName] = currBuild; - } -} - // Launch regular jobs. if (runConfigs.size() > 0) { println("\nSchedule jobs triggered by code changes:"); @@ -501,6 +489,18 @@ if (runConfigs.size() > 0) { println("No new commit or tags, nothing more to do.") } +// Launch canary jobs. +println("\nSchedule canary jobs once a day:") +canaryRunConfigs.each { config -> + def jobName = jobType + '_canary'; + def currBuild = LaunchJob(jobName, config); + + // LaunchJob will return null if the job doesn't exist or is disabled. + if (currBuild != null) { + ongoingBuild[jobName] = currBuild; + } +} + // Save the tag and commit IDs scheduled in the past and during this run to the // workspace. We save it at the end to be sure all jobs were launched. We save // the object IDs even in case of failure. There is no point of re-running the -- 2.34.1