X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=dsl%2Fkernel-lttng-modules.seed.groovy;h=50d10110bea54ffd80d5594499cbeeb49b4f3cb7;hb=92d7d4ccbeeaa2714ee209998d63493b0e6fe97f;hp=3fed04101088f74125e73a7d6d30d14809d8bbf7;hpb=0bb106eb816e82713ee0fc75c95de2ec22fb1c31;p=lttng-ci.git

diff --git a/dsl/kernel-lttng-modules.seed.groovy b/dsl/kernel-lttng-modules.seed.groovy
index 3fed041..50d1011 100644
--- a/dsl/kernel-lttng-modules.seed.groovy
+++ b/dsl/kernel-lttng-modules.seed.groovy
@@ -87,9 +87,10 @@ class BasicVersion implements Comparable<BasicVersion> {
     }
 }
 
-def kernelTagCutOff = new BasicVersion("4.3", "")
-def modulesBranches = ["master","stable-2.5","stable-2.6", "stable-2.4"]
+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"
@@ -141,6 +142,10 @@ if ( result.exitValue() == 0 ) {
     // Find the version cutoff
     def cutoffPos = versions.findIndexOf{(it.major >= kernelTagCutOff.major) && (it.minor >= kernelTagCutOff.minor) && (it.revision >= kernelTagCutOff.revision) && (it.build >= kernelTagCutOff.build) && (it.rc >= kernelTagCutOff.rc)}
 
+	// If error set cutoff on last so no job are created
+	if (cutoffPos == -1) {
+		cutoffPos = versions.size()
+	}
     // Get last version and include only last rc
     def last
     def lastNoRcPos
@@ -158,6 +163,12 @@ if ( result.exitValue() == 0 ) {
     String modulesPrefix = "lttng-modules"
     String kernelPrefix = "dsl-kernel"
     String separator = "-"
+
+
+	println("CutOff index")
+	println(cutoffPos)
+
+
     // Actual job creation
     for (int i = cutoffPos; i < versions.size() ; i++) {
 
@@ -223,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'))
@@ -236,46 +247,61 @@ if ( result.exitValue() == 0 ) {
 
     // Trigger generations
     def dslTriggerKernel = """\
-
 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 = "${kernelPrefix}"
+def jobStartWith = "dsl-kernel-"
+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
+			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 = []
+
+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(120000))
+		ongoingBuild.removeAll{ it.isCancelled() || it.isDone() }
+	}
 }
 
 if (fail){
-  throw new AbortException("Some job failed")
+	throw new AbortException("Some job failed")
 }
 """
 	def dslTriggerModule = """\
@@ -283,41 +309,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) {