Fix JENKINS-12423

jenkinsci · Jan 26, 2012 · 72951ad · 72951ad
1 parent d18ba07
commit 72951ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 158 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectListener.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectListener.java
@@ -54,14 +54,18 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil
                     infraEnvVarsMaster.putAll(getJenkinsSystemVariablesMaster(build));
                 }
 
-                //Add build variables (such as parameter variables).
+                //Add build variables
                 if (envInjectJobProperty.isKeepBuildVariables()) {
                     logger.info("Jenkins build variables are kept.");
                     Map<String, String> buildVariables = variableGetter.getBuildVariables(build, logger);
                     infraEnvVarsNode.putAll(buildVariables);
                     infraEnvVarsMaster.putAll(buildVariables);
                 }
 
+                //Add build parameters (or override)
+                Map<String, String> parametersVariables = variableGetter.getParametersVariables(build);
+                infraEnvVarsNode.putAll(parametersVariables);
+
                 final FilePath rootPath = getNodeRootPath();
                 if (rootPath != null) {
 
@@ -185,12 +189,28 @@ private FilePath getNodeRootPath() {
         return null;
     }
 
+
+    private boolean parameter2exclude(EnvironmentContributingAction a) {
+
+        if ((EnvInjectBuilder.ENVINJECT_BUILDER_ACTION_NAME).equals(a.getDisplayName())) {
+            return true;
+        }
+
+        if (a instanceof ParametersAction) {
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public void onCompleted(Run run, TaskListener listener) {
         EnvInjectLogger logger = new EnvInjectLogger(listener);
+
+        //Add other plugins env vars contribution variables (exclude builder action and parameter actions already populated)
         EnvVars envVars = new EnvVars();
         for (EnvironmentContributingAction a : Util.filter(run.getActions(), EnvironmentContributingAction.class)) {
-            if (!(EnvInjectBuilder.ENVINJECT_BUILDER_ACTION_NAME).equals(a.getDisplayName())) {
+            if (!parameter2exclude(a)) {
                 a.buildEnvVars((AbstractBuild<?, ?>) run, envVars);
             }
         }

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java