[JENKINS-28131] - Pass NODE_NAME into node{}

recena · recena · commit ae1b4c965a64 · 2015-06-27T10:18:19.000+01:00
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly
@@ -28,7 +28,6 @@ node {
     </p>
     <ul>
         <li><code>EXECUTOR_NUMBER</code></li>
-        <li><code>NODE_NAME</code></li>
         <li><code>NODE_LABELS</code></li>
         <li><code>WORKSPACE</code></li>
         <li>SCM-specific variables such as <code>SVN_REVISION</code></li>
diff --git a/support/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/support/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
@@ -417,9 +417,12 @@ 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.getEnvironment();
                         env.overrideAll(computer.buildEnvironment(listener));
+                        env.put("NODE_NAME", label);
                         env.put(COOKIE_VAR, cookie);
+
                         synchronized (runningTasks) {
                             runningTasks.put(cookie, new RunningTask(context));
                         }
