From d4970b706489bf686f65249ff646752094290018 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Thu, 23 May 2019 11:46:25 +0800 Subject: [PATCH] add project parameters and bindep file 1.add project parameters 2.add bindep file to install maven and openjdk-7-jdk The plugin missing customed parameters which are defined in project. Change-Id: If9580042590156025b0be6a69675186ee876c2ed Signed-off-by: dongwenjuan --- bindep.txt | 3 +++ .../java/hudson/plugins/gearman/StartJobWorker.java | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..c3ec899 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,3 @@ +maven [test] +# Javac Compiler in lib/tools.jar +openjdk-7-jdk [test platform:dpkg] diff --git a/src/main/java/hudson/plugins/gearman/StartJobWorker.java b/src/main/java/hudson/plugins/gearman/StartJobWorker.java index 33bfd83..173f827 100644 --- a/src/main/java/hudson/plugins/gearman/StartJobWorker.java +++ b/src/main/java/hudson/plugins/gearman/StartJobWorker.java @@ -20,6 +20,8 @@ package hudson.plugins.gearman; import hudson.model.Action; +import hudson.model.ParameterDefinition; +import hudson.model.ParametersDefinitionProperty; import hudson.model.ParameterValue; import hudson.model.Result; import hudson.model.AbstractBuild; @@ -158,6 +160,17 @@ public class StartJobWorker extends AbstractGearmanFunction { for (Map.Entry entry : inParams.entrySet()) { buildParams.add(new TextParameterValue(entry.getKey(), entry.getValue())); } + + // merge the build parameters from client and job definition + ParametersDefinitionProperty property = + (ParametersDefinitionProperty) project.getProperty( + ParametersDefinitionProperty.class); + if (property != null) { + for (ParameterDefinition def : property.getParameterDefinitions()) { + buildParams.add(def.getDefaultParameterValue()); + } + } + String offline = inParams.get("OFFLINE_NODE_WHEN_COMPLETE"); if (offline != null) { if (offline.equals("1") || offline.equals("true") ||