Add support of default core substitution variables and the computer environment

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>

Author: oleg-nenashev

src/main/java/hudson/plugins/perforce/utils/MacroStringHelper.java

@@ -224,6 +224,7 @@ private static String substituteParametersNoCheck (
 
         // Prepare the substitution container and substitute vars
         Map<String, String> substitutions = new HashMap<String, String>();
+        getDefaultCoreSubstitutions(substitutions);
         NodeSubstitutionHelper.getDefaultNodeSubstitutions(instance, node, substitutions);
         if (project != null) { 
             getDefaultSubstitutions(project, substitutions);
@@ -295,6 +296,19 @@ private static String getSafeJobName(@Nonnull AbstractProject project) {
         return project.getFullName().replace('/', '-').replace('=', '-').replace(',', '-');
     }
 
+    /**
+     * Gets variables of {@link Hudson} instance.
+     */
+    private static void getDefaultCoreSubstitutions(@Nonnull Map<String, String> env) {
+        String rootUrl = Hudson.getInstance().getRootUrl();
+        if (rootUrl != null) {
+            env.put("JENKINS_URL", rootUrl);
+            env.put("HUDSON_URL", rootUrl); // Legacy compatibility
+        }
+        env.put("JENKINS_HOME", Hudson.getInstance().getRootDir().getPath());
+        env.put("HUDSON_HOME", Hudson.getInstance().getRootDir().getPath());   // legacy compatibility
+    }
+    
     /**
      * Substitutes {@link PerforceSCM}-specific variables.
      * In order to retain the backward compatibility, the input subst map's
@@ -316,6 +330,10 @@ private static void getDefaultBuildSubstitutions(
         subst.put("BUILD_TAG", hudsonName + "-" + build.getProject().getName() + "-" + String.valueOf(build.getNumber()));
         subst.put("BUILD_ID", build.getId());
         subst.put("BUILD_NUMBER", String.valueOf(build.getNumber()));
+        String rootUrl = Hudson.getInstance().getRootUrl();
+        if (rootUrl != null) {   
+            subst.put("BUILD_URL", rootUrl + build.getUrl());
+        }
     }
 
 
@@ -324,6 +342,11 @@ private static void getDefaultSubstitutions(
             @Nonnull Map<String, String> subst) {
 
         subst.put("JOB_NAME", MacroStringHelper.getSafeJobName(project));
+        String rootUrl = Hudson.getInstance().getRootUrl();
+        if (rootUrl != null) {   
+            subst.put("JOB_URL", rootUrl + project.getUrl());
+        }
+        
         for (NodeProperty nodeProperty : Hudson.getInstance().getGlobalNodeProperties()) {
             if (nodeProperty instanceof EnvironmentVariablesNodeProperty) {
                 subst.putAll(((EnvironmentVariablesNodeProperty) nodeProperty).getEnvVars());

src/main/java/hudson/plugins/perforce/utils/NodeSubstitutionHelper.java

@@ -24,12 +24,16 @@
 
 package hudson.plugins.perforce.utils;
 
+import hudson.EnvVars;
+import hudson.Util;
 import hudson.model.Computer;
+import hudson.model.Executor;
 import hudson.model.Hudson;
 import hudson.model.Node;
 import hudson.plugins.perforce.PerforceSCM;
 import hudson.slaves.EnvironmentVariablesNodeProperty;
 import hudson.slaves.NodeProperty;
+import java.io.IOException;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -56,13 +60,14 @@ public class NodeSubstitutionHelper {
             @Nonnull PerforceSCM instance,
             @CheckForNull Node node, 
             @Nonnull Map<String, String> target) {
+        
         // Global node properties
         for (NodeProperty globalNodeProperty: Hudson.getInstance().getGlobalNodeProperties()) {
             if (globalNodeProperty instanceof EnvironmentVariablesNodeProperty) {
                 target.putAll(((EnvironmentVariablesNodeProperty)globalNodeProperty).getEnvVars());
             }
         }
-        
+             
         // Local node properties
         if (node != null) {
             for (NodeProperty nodeProperty : node.getNodeProperties()) {
@@ -71,10 +76,35 @@ public class NodeSubstitutionHelper {
                 }
             }
 
+            final String nodeName = node.getNodeName();
+            
             // Push legacy variables
-            target.put("nodename", node.getNodeName());
+            target.put("nodename", nodeName);
             target.put("hostname", getHostName(node));
             target.put("hash", getNodeHash(node));
+            
+            // Push modern variables
+            target.put("NODE_NAME", nodeName.isEmpty() ? "master" : nodeName);
+            target.put("NODE_LABELS", Util.join(node.getAssignedLabels(), " "));
+            Thread t = Thread.currentThread();
+            if (t instanceof Executor) {
+                Executor e = (Executor) t;
+                target.put("EXECUTOR_NUMBER", String.valueOf(e.getNumber()));
+            }
+            
+            // Get environment
+            Computer c = node.toComputer();
+            if (c != null) {
+                try {
+                    EnvVars env = c.getEnvironment().overrideAll(target);
+                    target.putAll(env);
+                } catch (IOException ex) {
+                    // Ignore exception
+                } catch (InterruptedException ex) {
+                    // Ignore exception
+                    // TODO: Handle the exception
+                }
+            }
         }
     }