[JENKINS-19307] buildEnvironmentFor job shouldn't override slave's en…

…vironment with master's (cherry picked from commit 5ac0427)
jenkinsci · Oct 18, 2013 · 8fdc471 · 8fdc471
1 parent bcb098b
commit 8fdc471
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java b/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java
@@ -24,6 +24,11 @@
 public class CoreEnvironmentContributor extends EnvironmentContributor {
     @Override
     public void buildEnvironmentFor(Run r, EnvVars env, TaskListener listener) throws IOException, InterruptedException {
+        Computer c = Computer.currentComputer();
+        if (c!=null){
+            EnvVars compEnv = c.getEnvironment().overrideAll(env);
+            env.putAll(compEnv);
+        }
         env.put("BUILD_DISPLAY_NAME",r.getDisplayName());
 
         Jenkins j = Jenkins.getInstance();
@@ -35,12 +40,6 @@ public void buildEnvironmentFor(Run r, EnvVars env, TaskListener listener) throw
 
     @Override
     public void buildEnvironmentFor(Job j, EnvVars env, TaskListener listener) throws IOException, InterruptedException {
-        Computer c = Computer.currentComputer();
-        if (c!=null){
-            EnvVars compEnv = c.getEnvironment().overrideAll(env);
-            env.putAll(compEnv);
-        }
-
         Jenkins jenkins = Jenkins.getInstance();
         String rootUrl = jenkins.getRootUrl();
         if(rootUrl!=null) {