From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 30 Jun 2015 17:00:53 +0000 (-0400)
Subject: Revert "Change cutOff for test and remove wait for kernel completion"
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=45fb418c36660391ec74fd93d4d8bb441776dcbc;p=lttng-ci.git

Revert "Change cutOff for test and remove wait for kernel completion"

This reverts commit a034649dd85c5b59e38b1b43ac2e8d12d62137bc.
---

diff --git a/dsl/kernel-lttng-modules.seed.groovy b/dsl/kernel-lttng-modules.seed.groovy
index 84d0e4b..e404d83 100644
--- 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("3.0", "")
+def kernelTagCutOff = new BasicVersion("4.1", "")
 def modulesBranches = []
 
 //def modulesBranches = ["master","stable-2.5","stable-2.6", "stable-2.4"]
@@ -266,10 +266,19 @@ jobs.each { job ->
     if (lastBuild == null) {
       try {
         def future = job.scheduleBuild2(0, new Cause.UpstreamCause(build))
-        println "\\tLaunched " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName)
+        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")
     }