Fixed: JENKINS-20968 - Doesn't resolve parameters in "TestNG XML repo…

…rt pattern" field Testing: tested locally
jenkinsci · Feb 9, 2014 · b03c0ad · b03c0ad
1 parent 8777f91
commit b03c0ad
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/README b/README
@@ -18,6 +18,7 @@ Release Notes
 
 ### Upcoming
 * Fixed: JENKINS-19353 - Exception error message newlines are escaped
+* Fixed: JENKINS-20968 - Doesn't resolve parameters in "TestNG XML report pattern" field
 
 ### v1.5
 * Fixed: JENKINS-19157 - Make st:bind work when Jenkins has jQuery plugin installed

diff --git a/src/main/java/hudson/plugins/testng/Publisher.java b/src/main/java/hudson/plugins/testng/Publisher.java
@@ -1,9 +1,22 @@
 package hudson.plugins.testng;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.model.*;
+import hudson.model.AbstractBuild;
+import hudson.model.AbstractProject;
+import hudson.model.Action;
+import hudson.model.BuildListener;
+import hudson.model.Result;
 import hudson.plugins.testng.results.TestNGResult;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
@@ -12,14 +25,6 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * This class defines a @Publisher and @Extension
  *
@@ -71,8 +76,7 @@ public Collection<? extends Action> getProjectActions(AbstractProject<?, ?> proj
     * {@inheritDoc}
     */
    @Override
-   public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
-            final BuildListener listener)
+   public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener)
          throws InterruptedException, IOException {
 
       PrintStream logger = listener.getLogger();
@@ -82,10 +86,14 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
          return true;
       }
 
+      // replace any variables in the user specified pattern
+      EnvVars env = build.getEnvironment(listener);
+      env.overrideAll(build.getBuildVariables());
+      String pathsPattern = env.expand(reportFilenamePattern);
+
       logger.println("TestNG Reports Processing: START");
-      logger.println("Looking for TestNG results report in workspace using pattern: "
-                     + reportFilenamePattern);
-      FilePath[] paths = locateReports(build.getWorkspace(), reportFilenamePattern);
+      logger.println("Looking for TestNG results report in workspace using pattern: " + pathsPattern);
+      FilePath[] paths = locateReports(build.getWorkspace(), pathsPattern);
 
       if (paths.length == 0) {
          logger.println("Did not find any matching files.");