X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fmaster.groovy;h=3ce6f9a723dfeea033586e1be909fdc39afe9932;hb=b6ebf05e2d64e5a86e3a5aec32f60c40feb95402;hp=6efffe5021ce3c575013129da608cc92343ec00e;hpb=74901baab3185f3a8bd6d9767477ea0d6e5da339;p=lttng-ci.git

diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy
index 6efffe5..3ce6f9a 100644
--- a/scripts/lttng-modules/master.groovy
+++ b/scripts/lttng-modules/master.groovy
@@ -348,6 +348,8 @@ if (uversion != null) {
     case 'jammy':
       matchStrs = [
         ~/^refs\/tags\/(Ubuntu-5\.15\.0-\d{1,3}?\.[\d]+)$/,
+        ~/^refs\/tags\/(Ubuntu-hwe-6\.2-6\.2\.0-.*_22\.04\.\d+)$/,
+        ~/^refs\/tags\/(Ubuntu-hwe-6\.5-6\.5\.0-.*_22\.04\.\d+)$/,
       ]
       break
 
@@ -358,20 +360,6 @@ if (uversion != null) {
       ]
       break
 
-    case 'bionic':
-      matchStrs = [
-        ~/^refs\/tags\/(Ubuntu-4\.15\.0-\d{1,3}?\.[\d]+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-5\.4-5\.4\.0-.*_18\.04\.\d+)$/,
-      ]
-      break
-
-    case 'xenial':
-      matchStrs = [
-        ~/^refs\/tags\/(Ubuntu-4\.4\.0-\d{1,3}?\.[\d]+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-4\.15\.0-.*_16\.04\.\d+)$/,
-      ]
-      break
-
     default:
       println "Unsupported Ubuntu version: ${uversion}"
       throw new InterruptedException()
@@ -443,15 +431,19 @@ switch (kverfilter) {
     }
     break
 
-  case 'lts':
+  case 'lts-head':
     // Keep only the head of each LTS branch and the latest non-RC tag
     println('Filter kernel versions to keep only the latest point release of each lts branch and the current stable.')
 
-    def lts_44 = kversionFactory.factory("v4.4")
-    def lts_49 = kversionFactory.factory("v4.9")
-    def lts_414 = kversionFactory.factory("v4.14")
-    def lts_419 = kversionFactory.factory("v4.19")
-    def lts_54 = kversionFactory.factory("v5.4")
+    def lts_kversions = []
+    lts_kversions.add(kversionFactory.factory("v4.4"))  // SLTS until 2026
+    lts_kversions.add(kversionFactory.factory("v4.9"))  // LTS until January 2023
+    lts_kversions.add(kversionFactory.factory("v4.14")) // LTS until January 2024
+    lts_kversions.add(kversionFactory.factory("v4.19")) // LTS until December 2024
+    lts_kversions.add(kversionFactory.factory("v5.4"))  // LTS until December 2025
+    lts_kversions.add(kversionFactory.factory("v5.10")) // LTS until December 2026
+    lts_kversions.add(kversionFactory.factory("v5.15")) // LTS until October 2026
+    lts_kversions.add(kversionFactory.factory("v6.1"))  // LTS until December 2026
 
     // First filter the head of each branch
     for (i = 0; i < kversions.size(); i++) {
@@ -475,7 +467,15 @@ switch (kverfilter) {
       }
 
       // Prune non-LTS versions
-      if (!(curr.isSameStable(lts_44) || curr.isSameStable(lts_49) || curr.isSameStable(lts_414) || curr.isSameStable(lts_419) || curr.isSameStable(lts_54))) {
+      def keep = false
+      for (j = 0; j < lts_kversions.size(); j++) {
+        if (curr.isSameStable(lts_kversions[j])) {
+          keep = true
+          break
+        }
+      }
+
+      if (!keep) {
         kversions.remove(i)
         i--
       }