From 82ecd4d4aae72a1ef851865f74931be1a79ae7c8 Mon Sep 17 00:00:00 2001 From: Brantone Date: Thu, 15 Sep 2016 01:31:59 -0700 Subject: [PATCH] JENKINS-30077 - Expand build parameters --- .../hudson/plugins/ws_cleanup/RemoteCleaner.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/hudson/plugins/ws_cleanup/RemoteCleaner.java b/src/main/java/hudson/plugins/ws_cleanup/RemoteCleaner.java index 726941b..130fbf5 100644 --- a/src/main/java/hudson/plugins/ws_cleanup/RemoteCleaner.java +++ b/src/main/java/hudson/plugins/ws_cleanup/RemoteCleaner.java @@ -29,6 +29,7 @@ import hudson.model.Run; import hudson.model.TaskListener; import hudson.slaves.EnvironmentVariablesNodeProperty; +import hudson.EnvVars; import java.io.IOException; import java.util.List; @@ -47,6 +48,17 @@ TaskListener listener, Run build ) { + try { + EnvVars vars = build.getEnvironment(listener); + + for (int i = 0; i < patterns.size(); i++) { + patterns.set(i, new Pattern(vars.expand(patterns.get(i).getPattern()), patterns.get(i).getType())); + } + externalDelete = vars.expand(externalDelete); + } catch (Exception e) { + e.printStackTrace(listener.getLogger()); + } + boolean wipeout = (patterns == null || patterns.isEmpty()) && (externalDelete == null || externalDelete.isEmpty()) ;