Move debug print and reduce thread sleep

[lttng-ci.git] / dsl / kernel-lttng-modules.seed.groovy

diff --git a/dsl/kernel-lttng-modules.seed.groovy b/dsl/kernel-lttng-modules.seed.groovy
index 5a23065138d7e967cc6f255da2ff2f9f5ef1b3c0..723b5e042765d1a6c2aea00f1c5d56f464db61a7 100644 (file)
--- a/dsl/kernel-lttng-modules.seed.groovy
+++ b/dsl/kernel-lttng-modules.seed.groovy
@@ -267,7 +267,7 @@ def limitQueue = 4
 def anotherBuild
 jobs.each { job ->
        def jobName = job.getName()
-               if (jobName.startsWith(jobStartWith)) {
+               if (jobName.startsWith(jobStartWithKernel)) {
                        counter = counter + 1
                        def lastBuild = job.getLastBuild()
                                if (lastBuild == null || lastBuild.result != Result.SUCCESS) {
@@ -301,14 +301,15 @@ while (toBuild.size() != 0) {
                it.task.name.startsWith(jobStartWithModule)
        }
 
-       if ((ongoingBuild.size() <= kernelEnabledNode) && (queuedTask.size() < limitQueue)) {
+       if ((ongoingBuild.size() <= kernelEnabledNode.intdiv(2)) && (queuedTask.size() < limitQueue)) {
                def job = toBuild.pop()
                ongoingBuild.push(job.scheduleBuild2(0))
-               println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithModule).size() + "module jobs are queued"
-               println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithKernel).size() + "kernel jobs are queued"
                println "\\t trigering " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName)
        } else {
-               Thread.sleep(random.nextInt(120000))
+               println "Currently " + ongoingBuild.size() + " build currently on execution. Limit: " + kernelEnabledNode.intdiv(2)
+               println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithModule)}.size() + " module jobs are queued. Limit: " + limitQueue
+               println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithKernel)}.size() + " kernel jobs are queued. Limit: " + limitQueue
+               Thread.sleep(random.nextInt(60000))
                ongoingBuild.removeAll{ it.isCancelled() || it.isDone() }
        }
 }
@@ -368,7 +369,6 @@ if (fail){
 
        dslTriggerKernel = dslTriggerKernel.replaceAll("KERNELPREFIX", kernelPrefix)
        dslTriggerKernel = dslTriggerKernel.replaceAll("MODULEPREFIX", modulesPrefix)
-       dslTriggerModule = dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator)
     if (isJenkinsInstance) {
         freeStyleJob("dsl-trigger-kernel") {
             steps {
@@ -380,6 +380,7 @@ if (fail){
                }
 
                modulesBranches.each { branch ->
+                       dslTriggerModule = dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator)
                        freeStyleJob("dsl-trigger-module-${branch}") {
                                steps {
                                        systemGroovyCommand(dslTriggerModule)