From c9c7c76ba0c1b5325dce6ea4b4e97993a7c297be Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 18 Dec 2017 14:47:11 -0500
Subject: [PATCH] jjb: use linux-stable-rt for modules rt build

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-modules.yaml                |  2 +-
 scripts/lttng-modules/master-rt.groovy | 55 ++++++++++++++++++--------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 94afe26..8749337 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -93,7 +93,7 @@
           description: 'Kernel versions list filtering strategy.'
       - string:
           name: 'kgitrepo'
-          default: 'git://git-mirror.internal.efficios.com/kernel/rt/linux-rt-devel.git'
+          default: 'git://git-mirror.internal.efficios.com/kernel/rt/linux-stable-rt.git'
           description: 'The linux kernel git repository url.'
       - string:
           name: 'kbuildjob'
diff --git a/scripts/lttng-modules/master-rt.groovy b/scripts/lttng-modules/master-rt.groovy
index 33eb0f3..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
-- 
2.34.1