[FIXED JENKINS-26552] Provide a full Computer.environment to @StepCon…

…textParameter EnvVars.
jenkinsci · Jan 22, 2015 · b490007 · b490007
1 parent 5a9ae5b
commit b490007
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java
@@ -26,7 +26,6 @@
 
 import groovy.lang.GroovyObjectSupport;
 import hudson.EnvVars;
-import hudson.model.Computer;
 import hudson.model.Run;
 import hudson.util.LogTaskListener;
 import java.io.IOException;
@@ -72,14 +71,14 @@ public Map<String,String> getOverriddenEnvironment() {
 
     @Override public Object getProperty(String propertyName) {
         try {
-            String val = getEnvironment().get(propertyName);
-            if (val == null) {
-                Computer computer = CpsThread.current().getContextVariable(Computer.class);
-                if (computer != null) {
-                    return computer.getEnvironment().get(propertyName);
+            EnvVars overridden = CpsThread.current().getContextVariable(EnvVars.class);
+            if (overridden != null) {
+                String val = overridden.get(propertyName);
+                if (val != null) {
+                    return val;
                 }
             }
-            return val;
+            return getEnvironment().get(propertyName);
         } catch (Exception x) {
             LOGGER.log(Level.WARNING, null, x);
             return null;

diff --git a/...ort/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/...ort/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
@@ -387,7 +387,8 @@ private final class PlaceholderExecutable implements ContinuableExecutable {
                         cookie = UUID.randomUUID().toString();
                         // Switches the label to a self-label, so if the executable is killed and restarted via ExecutorPickle, it will run on the same node:
                         label = computer.getName();
-                        EnvVars env = computer.buildEnvironment(listener);
+                        EnvVars env = computer.getEnvironment();
+                        env.overrideAll(computer.buildEnvironment(listener));
                         env.put(COOKIE_VAR, cookie);
                         synchronized (runningTasks) {
                             runningTasks.put(cookie, context);