Test queue based queuing

[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..9745224828faddd86b091d0a7772c9b06c14ce0f 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
@@ -260,6 +261,7 @@ def fail = false
 def jobStartWith = "dsl-kernel-"
 def toBuild = []
 def counter = 0
+def limitQueue = 4
 
 def anotherBuild
 jobs.each { job ->
@@ -288,12 +290,18 @@ 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.
+       def queuedTask = q.getItems().findAll { it.task.name.startsWith(jobStartWith) }
+       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 "Debug: currenlty queued task" + q.getItems().size()
        } else {
                Thread.sleep(random.nextInt(120000))
                ongoingBuild.removeAll{ it.isCancelled() || it.isDone() }