Change cutOff for test and remove wait for kernel completion

[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 202a11dc7a00e4456ccad8729b1b85f2a020ec21..84d0e4bcdf2d79d57c5e474241461315b399dd10 100644 (file)
--- 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.0", "")
-def modulesBranches = ["master","stable-2.5.0","stable-2.6.0", "stable-2.4.0"]
+def kernelTagCutOff = new BasicVersion("3.0", "")
+def modulesBranches = []
 
+//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++) {
 
@@ -255,19 +266,10 @@ jobs.each { job ->
     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()
+        println "\\tLaunched " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName)
       } 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")
     }
@@ -325,6 +327,9 @@ if (fail){
             steps {
                 systemGroovyCommand(dslTriggerKernel)
             }
+                       triggers {
+                               cron("H 0 * * *")
+                       }
                }
 
                modulesBranches.each { branch ->
@@ -332,6 +337,9 @@ if (fail){
                                steps {
                                        systemGroovyCommand(dslTriggerModule.replaceAll("JOBPREFIX",modulesPrefix + separator + branch + separator))
                                }
+                               triggers {
+                                       scm('@daily')
+                               }
                        }
                }
     }