demo

[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 608282fd690ff513dbc570db62a41f43831c8a8b..76f1af60a651d565a812031a2bc941554ed420c9 100644 (file)
--- a/dsl/kernel-lttng-modules.seed.groovy
+++ b/dsl/kernel-lttng-modules.seed.groovy
@@ -87,7 +87,7 @@ class BasicVersion implements Comparable<BasicVersion> {
     }
 }
 
-def kernelTagCutOff = new BasicVersion("4.0", "")
+def kernelTagCutOff = new BasicVersion("3.0", "")
 def modulesBranches = ["master","stable-2.5.0","stable-2.6.0", "stable-2.4.0"]
 
 
@@ -100,14 +100,15 @@ String recipeCheckoutTo = "recipe"
 String modulesCheckoutTo = "lttng-modules"
 
 def linuxGitReference = "/home/jenkins/gitcache/linux-stable.git"
-String process = "git ls-remote -t $linuxURL | cut -c42- | sort -V"
 
 // Check if we are on jenkins
 // Useful for outside jenkins devellopment related to groovy only scripting
 def isJenkinsInstance = binding.variables.containsKey('JENKINS_HOME')
 
+// Fetch tags and format
 // Split the string into sections based on |
 // And pipe the results together
+String process = "git ls-remote -t $linuxURL | cut -c42- | sort -V"
 def out = new StringBuilder()
 def err = new StringBuilder()
 Process result = process.tokenize( '|' ).inject( null ) { p, c ->
@@ -137,7 +138,7 @@ if ( result.exitValue() == 0 ) {
     // Sort the version via Comparable implementation of KernelVersion
     versions = versions.sort()
 
-    // Find the version cut of
+    // 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)}
 
     // Get last version and include only last rc
@@ -286,7 +287,7 @@ import java.util.concurrent.CancellationException
 
 def jobs = hudson.model.Hudson.instance.items
 def fail = false
-def jobStartWith = "${modulesPrefix + separator}%1$s"
+def jobStartWith = "JOBPREFIX"
 
 def anotherBuild
 jobs.each { job ->
@@ -329,7 +330,7 @@ if (fail){
                modulesBranches.each { branch ->
                        freeStyleJob("dsl-trigger-module-${branch}") {
                                steps {
-                                       systemGroovyCommand(snprintf(dslTriggerModule,[branch]))
+                                       systemGroovyCommand(dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator))
                                }
                        }
                }