-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-23025] Allow container IDs contain env. variables
- Loading branch information
Showing
5 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/main/java/org/jenkinsci/plugins/dockerbuildstep/util/Resolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package org.jenkinsci.plugins.dockerbuildstep.util; | ||
|
||
import hudson.Util; | ||
import hudson.model.AbstractBuild; | ||
import hudson.util.VariableResolver; | ||
|
||
/** | ||
* Convenient class for resolving/expanding various variabales. | ||
* | ||
* @author vjuranek | ||
* | ||
*/ | ||
public class Resolver { | ||
|
||
public static String buildVar(final AbstractBuild<?, ?> build,final String toResolve) { | ||
VariableResolver<String> vr = build.getBuildVariableResolver(); | ||
String resolved = Util.replaceMacro(toResolve, vr); | ||
try { | ||
resolved = build.getEnvironment().expand(resolved); //TODO avoid deprecated method | ||
} catch (Exception e) { | ||
//TODO no-op? | ||
} | ||
return resolved; | ||
} | ||
} |