From 0d4a7f6b39b9d06bc219eb172cb568a6dfe0120b Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 6 Feb 2018 13:41:30 -0500 Subject: [PATCH] jjb: lava: do not use empty default params Signed-off-by: Francis Deslauriers --- scripts/system-tests/system-trigger.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy index d84b15b..6833c2a 100644 --- 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)) -- 2.34.1