Skip to content

Expand environment variables in repository URL. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kutzi merged 11 commits into from
Oct 7, 2013
Merged

Expand environment variables in repository URL. #38

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e06583f
Expand environment variables in repository URL in job confguration du…
jglick Mar 1, 2013
aa9f9d3
$SVN_REVISION also needs to take into account possibly substituted se…
jglick Mar 18, 2013
ba34e12
checkRevisionPropertiesSupported also needs to subst env vars.
jglick Mar 18, 2013
7c0c0fe
Different overload now being called.
jglick Mar 18, 2013
7785a9a
Merge branch 'master' into doCheckRemote-masterEnvVars
jglick May 24, 2013
add273b
Merge branch 'master' into doCheckRemote-masterEnvVars
jglick Jun 6, 2013
eb0edaf
Revised to only use masterEnvVars from getExpandedLocation(AbstractBu…
jglick Jun 6, 2013
65fe472
Merge branch 'master' into doCheckRemote-masterEnvVars
jglick Jun 17, 2013
4b120f4
Make buildEnvVars take into account non-build variables when computin…
jglick Jun 17, 2013
6819927
Merge branch 'master' into doCheckRemote-masterEnvVars
jglick Jul 16, 2013
5e006e5
Make sure SVN_* variables are set even when SVN location involves rec…
jglick Jul 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/hudson/scm/SubversionSCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ public boolean isFilterChangelog() {
public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
super.buildEnvVars(build, env);

ModuleLocation[] svnLocations = getLocations(build);
ModuleLocation[] svnLocations = getLocations(new EnvVars(EnvVars.masterEnvVars), build);
Copy link
Copy Markdown
Member Author

@jglick jglick Jun 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this is wrong, because getLocations ignores build when env is set. Need to consider both combined.


try {
Map<String,Long> revisions = parseSvnRevisionFile(build);
Expand Down Expand Up @@ -1955,6 +1955,8 @@ public FormValidation doCheckRemote(StaplerRequest req, @AncestorInPath Abstract

if(isValidateRemoteUpToVar()) {
url = (url.indexOf('$') != -1) ? url.substring(0, url.indexOf('$')) : url;
} else {
url = new EnvVars(EnvVars.masterEnvVars).expand(url);
}

if(!URL_PATTERN.matcher(url).matches())
Expand Down Expand Up @@ -2169,7 +2171,7 @@ public FormValidation doCheckRevisionPropertiesSupported(@AncestorInPath Abstrac
return FormValidation.ok();

try {
SVNURL repoURL = SVNURL.parseURIDecoded(v);
SVNURL repoURL = SVNURL.parseURIDecoded(new EnvVars(EnvVars.masterEnvVars).expand(v));
if (checkRepositoryPath(context,repoURL)!=SVNNodeKind.NONE)
// something exists
return FormValidation.ok();
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/hudson/scm/SubversionSCMUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void shouldSetEnvironmentVariablesWithSingleSvnModule() throws IOExceptio
SubversionSCM scm = mockSCMForBuildEnvVars();

ModuleLocation[] singleLocation = new ModuleLocation[] {new ModuleLocation("/remotepath", "")};
when(scm.getLocations(any(AbstractBuild.class))).thenReturn(singleLocation);
when(scm.getLocations(any(EnvVars.class), any(AbstractBuild.class))).thenReturn(singleLocation);

Map<String, Long> revisions = new HashMap<String, Long>();
revisions.put("/remotepath", 4711L);
Expand Down Expand Up @@ -83,7 +83,7 @@ public void shouldSetEnvironmentVariablesWithMultipleSvnModules() throws IOExcep
ModuleLocation[] locations = new ModuleLocation[] {
new ModuleLocation("/remotepath1", ""),
new ModuleLocation("/remotepath2", "")};
when(scm.getLocations(any(AbstractBuild.class))).thenReturn(locations);
when(scm.getLocations(any(EnvVars.class), any(AbstractBuild.class))).thenReturn(locations);

Map<String, Long> revisions = new HashMap<String, Long>();
revisions.put("/remotepath1", 4711L);
Expand Down