jjb: lava: do not use empty default params

[lttng-ci.git] / scripts / system-tests / system-trigger.groovy

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index 3bfbaf9c75303d1a7ef7b1a85d11785b92a30e29..6833c2a58dc26fc88e84957afb94be1bb7faaf5b 100644 (file)
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -290,7 +290,11 @@ def LaunchJob = { jobName, runConfig ->
   def job = Hudson.instance.getJob(jobName)
   def params = []
   for (paramdef in job.getProperty(ParametersDefinitionProperty.class).getParameterDefinitions()) {
-    params += paramdef.getDefaultParameterValue();
+    // If there is a default value for this parameter, use it. Don't use empty
+    // default value parameters.
+    if (paramdef.getDefaultValue()) {
+      params += paramdef.getDefaultParameterValue();
+    }
   }
 
   params.add(new StringParameterValue('LTTNG_TOOLS_COMMIT_ID', runConfig.lttngToolsCommitId))
@@ -322,7 +326,7 @@ def recentLttngBranchesOfInterest = ['master', 'stable-2.10', 'stable-2.9']
 def recentLinuxBranchesOfInterest = ['master', 'linux-4.9.y', 'linux-4.4.y']
 
 def legacyLttngBranchesOfInterest = ['stable-2.7']
-def legacyLinuxBranchesOfInterest = ['linux-3.18.y', 'linux-4.4.y']
+def legacyLinuxBranchesOfInterest = ['linux-3.18.y']
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set