X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fmaster-rt.groovy;h=0e94ee48d5013323cb7e42fe36eeed1968414ac1;hb=417251718144a9f5ab350abe6a15aca660819ab9;hp=9d94be2cc4dacb47c4a0e0edab91ffb3d71909b1;hpb=af3990edf0cfb000b21aca11ab1621ff0df98a07;p=lttng-ci.git

diff --git a/scripts/lttng-modules/master-rt.groovy b/scripts/lttng-modules/master-rt.groovy
index 9d94be2..0e94ee4 100644
--- a/scripts/lttng-modules/master-rt.groovy
+++ b/scripts/lttng-modules/master-rt.groovy
@@ -180,19 +180,21 @@ def refs = Git.lsRemoteRepository().setTags(true).setRemote(kgitrepo).call();
 
 // Get kernel versions to build
 def kversions = []
-def matchStrs = [
+def tagMatchStrs = [
   ~/^refs\/tags\/(v[\d\.]+(-rt(\d+)-rebase))$/,
 ]
 def blacklist = [
-  'v4.11.8-rt5-rebase',
-  'v4.11.9-rt6-rebase',
-  'v4.11.9-rt7-rebase',
-  'v4.11.12-rt8-rebase',
-  'v4.11.12-rt9-rebase',
-  'v4.11.12-rt10-rebase',
-  'v4.11.12-rt11-rebase',
-  'v4.11.12-rt12-rebase',
-  'v4.11.12-rt13-rebase',
+  ~/v4\.11\.8-rt5-rebase/,
+  ~/v4\.11\.9-rt6-rebase/,
+  ~/v4\.11\.9-rt7-rebase/,
+  ~/v4\.11\.12-rt8-rebase/,
+  ~/v4\.11\.12-rt9-rebase/,
+  ~/v4\.11\.12-rt10-rebase/,
+  ~/v4\.11\.12-rt11-rebase/,
+  ~/v4\.11\.12-rt12-rebase/,
+  ~/v4\.11\.12-rt13-rebase/,
+  ~/v3\.6.*-rebase/,
+  ~/v3\.8.*-rebase/,
 ]
 
 def kversionFactory = new RTKVersion()
@@ -214,13 +216,29 @@ try {
 
 // Build a sorted list of versions to build
 for (ref in refs) {
-  for (matchStr in matchStrs) {
-    def match = ref.getName() =~ matchStr
-    if (match && !blacklist.contains(match.group(1))) {
-      def v = kversionFactory.factory(match.group(1))
+  for (tagMatchStr in tagMatchStrs) {
+    def tagMatch = ref.getName() =~ tagMatchStr
 
-      if ((v >= kverfloor) && (v < kverceil)) {
-        kversions.add(v)
+    if (tagMatch) {
+      def kversion_raw = tagMatch.group(1)
+      def blacklisted = false
+
+      // Check if the kversion is blacklisted
+      for (blackMatchStr in blacklist) {
+        def blackMatch = kversion_raw =~ blackMatchStr
+
+        if (blackMatch) {
+          blacklisted = true
+          break;
+        }
+      }
+
+      if (!blacklisted) {
+        def v = kversionFactory.factory(kversion_raw)
+
+        if ((v >= kverfloor) && (v < kverceil)) {
+          kversions.add(v)
+        }
       }
     }
   }
@@ -228,6 +246,11 @@ for (ref in refs) {
 
 kversions.sort()
 
+//println "Pre filtering kernel versions:"
+//for (k in kversions) {
+//  println k
+//}
+
 switch (kverfilter) {
   case 'stable-head':
     // Keep only the head of each stable branch
@@ -354,7 +377,7 @@ for (b in allBuilds) {
 
 // Mark this build failed if any child build has failed
 if (isFailed) {
-  build.getExecutor().interrupt(Result.FAILURE)
+  build.setResult(hudson.model.Result.FAILURE)
 }
 
 // EOF