Wrong variable name

[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 56fe7468eb5c04d9fb9d5b5c8b50aa48cd37eb10..af312c2fc63f1541a32d0b3fb9526fc46870c0c2 100644 (file)
--- a/dsl/kernel-lttng-modules.seed.groovy
+++ b/dsl/kernel-lttng-modules.seed.groovy
@@ -93,7 +93,7 @@ def modulesBranches = ["master", "stable-2.5", "stable-2.6"]
 //def modulesBranches = ["master","stable-2.5","stable-2.6", "stable-2.4"]
 
 def linuxURL = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-def modulesURL = "git://git.lttng.org/lttng-modules.git"
+def modulesURL = "https://github.com/lttng/lttng-modules.git"
 
 // Linux specific variable
 String linuxCheckoutTo = "linux-source"
@@ -234,7 +234,7 @@ if ( result.exitValue() == 0 ) {
                             }
                         }
                         steps {
-                            copyArtifacts("${jobName}/arch=\$arch", "linux-artifact/**", '', false, false) {
+                            copyArtifacts("${jobName}/arch=\$arch,label=kernel", "linux-artifact/**", '', false, false) {
                                 latestSuccessful(true) // Latest successful build
                             }
                             shell(readFileFromWorkspace('lttng-modules/lttng-modules-dsl-master.sh'))
@@ -248,6 +248,7 @@ if ( result.exitValue() == 0 ) {
     // Trigger generations
     def dslTriggerKernel = """\
 import hudson.model.*
+import jenkins.model.*
 import hudson.AbortException
 import hudson.console.HyperlinkNote
 import java.util.concurrent.CancellationException
@@ -257,14 +258,16 @@ import java.util.Random
 Random random = new Random()
 def jobs = hudson.model.Hudson.instance.items
 def fail = false
-def jobStartWith = "dsl-kernel-"
+def jobStartWithKernel = "KERNELPREFIX"
+def jobStartWithModule = "MODULEPREFIX"
 def toBuild = []
 def counter = 0
+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) {
@@ -288,12 +291,22 @@ hudson.model.Hudson.instance.nodes.each { node ->
 println "Nb of live kernel enabled build node "+ kernelEnabledNode
 
 def ongoingBuild = []
+def q = jenkins.model.Jenkins.getInstance().getQueue() 
 
 while (toBuild.size() != 0) {
-       if(ongoingBuild.size() <= (kernelEnabledNode.intdiv(2))) {
+       // Throttle the build with both the number of current parent task and queued
+       // task.Look for both kernel and downstream module from previous kernel.
+       def queuedTask = q.getItems().findAll {
+               it.task.name.startsWith(jobStartWithKernel) ||
+               it.task.name.startsWith(jobStartWithModule)
+       }
+
+       if ((ongoingBuild.size() <= kernelEnabledNode) && (queuedTask.size() < limitQueue)) {
                def job = toBuild.pop()
                ongoingBuild.push(job.scheduleBuild2(0))
-               println "\\t trigering" + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName)
+               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))
                ongoingBuild.removeAll{ it.isCancelled() || it.isDone() }
@@ -352,6 +365,9 @@ if (fail){
        throw new AbortException("Some job failed")
 }
 """
+
+       dslTriggerKernel = dslTriggerKernel.replaceAll("KERNELPREFIX", kernelPrefix)
+       dslTriggerKernel = dslTriggerKernel.replaceAll("MODULEPREFIX", modulesPrefix)
     if (isJenkinsInstance) {
         freeStyleJob("dsl-trigger-kernel") {
             steps {
@@ -363,9 +379,10 @@ if (fail){
                }
 
                modulesBranches.each { branch ->
+                       dslTriggerModule = dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator)
                        freeStyleJob("dsl-trigger-module-${branch}") {
                                steps {
-                                       systemGroovyCommand(dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator))
+                                       systemGroovyCommand(dslTriggerModule)
                                }
                                triggers {
                                        scm('@daily')