Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
replace Jenkins default variables. (JENKINS-14345)
  • Loading branch information
kiy0taka committed Apr 22, 2013
1 parent 68cac5f commit 9027b7c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/main/java/com/g2one/hudson/grails/GrailsBuilder.java
Expand Up @@ -24,6 +24,7 @@
import hudson.model.Hudson;
import hudson.tasks.Builder;
import hudson.util.ArgumentListBuilder;
import hudson.util.VariableResolver;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
Expand Down Expand Up @@ -313,6 +314,7 @@ private FilePath getBasePath(AbstractBuild<?, ?> build) {
*/
@SuppressWarnings({"StaticMethodOnlyUsedInOneClass", "TypeMayBeWeakened"})
static String evalTarget(Map<String, String> env, String target) {
target = Util.replaceMacro(target, new VariableResolver.ByMap<String>(env));
Binding binding = new Binding();
binding.setVariable("env", env);
binding.setVariable("sys", System.getProperties());
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/com/g2one/hudson/grails/GrailsBuilderTest.java
Expand Up @@ -68,6 +68,9 @@ public void getTargetsToRun_with_env() {
assertThat(newBuilderWithTargets("${env['FOO']}").getTargetsToRun(env),
is(arrayOfStrings(new String[] {"foo"})));

assertThat(newBuilderWithTargets("${FOO}").getTargetsToRun(env),
is(arrayOfStrings(new String[] {"foo"})));

assertThat(newBuilderWithTargets("\"test-app -clean\" \"war target/${env['FOO']}.war\"").getTargetsToRun(env),
is(arrayOfStrings(
new String[] {"test-app", "-clean"},
Expand Down

0 comments on commit 9027b7c

Please sign in to comment.