[FIXED JENKINS-30735] Expand environment variabes in file pattern.

jenkinsci · May 25, 2016 · 2ad35a7 · 2ad35a7
1 parent c1f8298
commit 2ad35a7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/dry/DryPublisher.java b/src/main/java/hudson/plugins/dry/DryPublisher.java
@@ -15,6 +15,7 @@
 import hudson.model.Action;
 import hudson.model.BuildListener;
 import hudson.model.Run;
+import hudson.model.TaskListener;
 import hudson.plugins.analysis.core.BuildResult;
 import hudson.plugins.analysis.core.FilesParser;
 import hudson.plugins.analysis.core.HealthAwarePublisher;
@@ -118,7 +119,8 @@ public BuildResult perform(final Run<?, ?> build, final FilePath workspace, fina
             InterruptedException, IOException {
         logger.log("Collecting duplicate code analysis files...");
 
-        FilesParser dryCollector = new FilesParser(PLUGIN_NAME, StringUtils.defaultIfEmpty(getPattern(), DEFAULT_DRY_PATTERN),
+        FilesParser dryCollector = new FilesParser(PLUGIN_NAME,
+                StringUtils.defaultIfEmpty(expandFilePattern(getPattern(), build.getEnvironment(TaskListener.NULL)), DEFAULT_DRY_PATTERN),
                     new DuplicationParserRegistry(getNormalThreshold(), getHighThreshold(), workspace.getRemote(),
                             getDefaultEncoding()),
                     shouldDetectModules(), isMavenBuild(build));