From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 29 May 2023 21:14:21 +0000 (-0400)
Subject: Merge changes from topic "system_tests-trigger_failure"
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=2fad6b3dfbd16e0ae64fdc25ad35df7bdb2f6ff7;hp=b2f18af4604f35660d9162f65f87e8d59f35e8ea;p=lttng-ci.git

Merge changes from topic "system_tests-trigger_failure"

* changes:
  Update linux branches of interest for system tests
  jjb: Update system_jobs default rootfs URL to jammy
  jjb: Fix crash when launching new jobs from the the system trigger
---

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index f5cd3ed..675e74b 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -37,7 +37,7 @@
           description: 'LTTng-UST git repo to checkout the UST id'
       - string:
           name: 'ROOTFS_URL'
-          default: 'https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz'
+          default: 'https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_jammy_2023-05-18.tar.gz'
           description: 'The URL at which the system root FS can be downloaded'
       - string:
           name: 'LTTNG_CI_REPO'
diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index dc4e9b7..fd5b901 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -273,7 +273,7 @@ def LaunchJob = { jobName, jobInfo ->
   for (paramdef in job.getProperty(ParametersDefinitionProperty.class).getParameterDefinitions()) {
     // If there is a default value for this parameter, use it. Don't use empty
     // default value parameters.
-    if (paramdef.getDefaultValue()) {
+    if (paramdef.getDefaultParameterValue() != null) {
       params += paramdef.getDefaultParameterValue();
     }
   }
@@ -304,18 +304,23 @@ def recentLttngBranchesOfInterest = ['master',
   'stable-2.13',
   'stable-2.12']
 def recentLinuxBranchesOfInterest = ['master',
-  'linux-5.16.y',
+  'linux-6.1.y',
   'linux-5.15.y',
   'linux-5.10.y',
   'linux-5.4.y',
   'linux-4.19.y',
   'linux-4.14.y',
-  'linux-4.9.y']
+]
 
 def legacyLttngBranchesOfInterest = []
-def legacyLinuxBranchesOfInterest = []
-
-def vmLinuxBranchesOfInterest = ['linux-3.18.y']
+def legacyLinuxBranchesOfInterest = [
+    'linux-5.14.y',
+    'linux-4.18.y',
+    'linux-4.12.y',
+    'linux-4.9.y',
+]
+
+def vmLinuxBranchesOfInterest = []
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set