X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=dsl%2Fkernel-lttng-modules.seed.groovy;h=9745224828faddd86b091d0a7772c9b06c14ce0f;hb=1fc68d3f50a0baccf0a5ef044485016209c6f087;hp=e404d834505c2529e8c0cca9eccafa3eb7aef181;hpb=45fb418c36660391ec74fd93d4d8bb441776dcbc;p=lttng-ci.git diff --git a/dsl/kernel-lttng-modules.seed.groovy b/dsl/kernel-lttng-modules.seed.groovy index e404d83..9745224 100644 --- a/dsl/kernel-lttng-modules.seed.groovy +++ b/dsl/kernel-lttng-modules.seed.groovy @@ -87,13 +87,13 @@ class BasicVersion implements Comparable { } } -def kernelTagCutOff = new BasicVersion("4.1", "") -def modulesBranches = [] +def kernelTagCutOff = new BasicVersion("2.6.36", "") +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')) @@ -247,46 +247,69 @@ 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 +import java.util.Random +Random random = new Random() def jobs = hudson.model.Hudson.instance.items def fail = false -def jobStartWith = "${kernelPrefix}" +def jobStartWith = "dsl-kernel-" +def toBuild = [] +def counter = 0 +def limitQueue = 4 def anotherBuild jobs.each { job -> - def jobName = job.getName() - if (jobName.startsWith(jobStartWith)) { - def lastBuild = job.getLastBuild() - if (lastBuild == null) { - try { - def future = job.scheduleBuild2(0, new Cause.UpstreamCause(build)) - println "\\tWaiting for the completion of " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName) - anotherBuild = future.get() - } catch (CancellationException x) { - throw new AbortException("\${job.fullDisplayName} aborted.") - } - println HyperlinkNote.encodeTo('/' + anotherBuild.url, anotherBuild.fullDisplayName) + " completed. Result was " + anotherBuild.result - - build.result = anotherBuild.result - if (anotherBuild.result != Result.SUCCESS && anotherBuild.result != Result.UNSTABLE) { - // We abort this build right here and now. - fail = true - println("Build Failed") - } - } else { - println("\\tAlready built") - } - } + def jobName = job.getName() + if (jobName.startsWith(jobStartWith)) { + counter = counter + 1 + def lastBuild = job.getLastBuild() + if (lastBuild == null || lastBuild.result != Result.SUCCESS) { + toBuild.push(job) + } else { + println("\\tAlready built") + } + } +} + +println "Kernel total "+ counter +println "Kernel to build "+ toBuild.size() + + +def kernelEnabledNode = 0 +hudson.model.Hudson.instance.nodes.each { node -> + if (node.getLabelString().contains("kernel")){ + kernelEnabledNode++ + } +} +println "Nb of live kernel enabled build node "+ kernelEnabledNode + +def ongoingBuild = [] +def q = jenkins.model.Jenkins.getInstance().getQueue() + + +while (toBuild.size() != 0) { + // 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() } + } } if (fail){ - throw new AbortException("Some job failed") + throw new AbortException("Some job failed") } """ def dslTriggerModule = """\ @@ -294,41 +317,47 @@ import hudson.model.* import hudson.AbortException import hudson.console.HyperlinkNote import java.util.concurrent.CancellationException +import java.util.Random +Random random = new Random() def jobs = hudson.model.Hudson.instance.items def fail = false def jobStartWith = "JOBPREFIX" +def toBuild = [] +def counter = 0 def anotherBuild jobs.each { job -> - def jobName = job.getName() - if (jobName.startsWith(jobStartWith)) { - def lastBuild = job.getLastBuild() - if (lastBuild == null) { - try { - def future = job.scheduleBuild2(0, new Cause.UpstreamCause(build)) - println "\\tWaiting for the completion of " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName) - anotherBuild = future.get() - } catch (CancellationException x) { - throw new AbortException("\${job.fullDisplayName} aborted.") - } - println HyperlinkNote.encodeTo('/' + anotherBuild.url, anotherBuild.fullDisplayName) + " completed. Result was " + anotherBuild.result - - build.result = anotherBuild.result - if (anotherBuild.result != Result.SUCCESS && anotherBuild.result != Result.UNSTABLE) { - // We abort this build right here and now. - fail = true - println("Build Failed") - } - } else { - println("\\tAlready built") - } - } + def jobName = job.getName() + if (jobName.startsWith(jobStartWith)) { + counter = counter + 1 + toBuild.push(job) + } +} + +// Get valid node +def kernelEnabledNode = 0 +hudson.model.Hudson.instance.nodes.each { node -> + if (node.getLabelString().contains("kernel")){ + kernelEnabledNode++ + } +} + +def ongoingBuild = [] +while (toBuild.size() != 0) { + if(ongoingBuild.size() <= (kernelEnabledNode.intdiv(2))) { + def job = toBuild.pop() + ongoingBuild.push(job.scheduleBuild2(0)) + println "\\t trigering " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName) + } else { + Thread.sleep(random.nextInt(60000)) + ongoingBuild.removeAll{ it.isCancelled() || it.isDone() } + } } if (fail){ - throw new AbortException("Some job failed") + throw new AbortException("Some job failed") } """ if (isJenkinsInstance) {