Skip to content
Permalink
Browse files
JENKINS-24735 - Add support for build parameters in Subversion URLs
 * Expand parameters from upstream job not from property owner
 * Updated test
  • Loading branch information
alexouzounis committed Oct 20, 2014
1 parent 453bb3b commit 5da95aade63c7c07d2b582f15f155a22773414d7
@@ -124,8 +124,8 @@ public ModuleLocation getUpstreamSubversionLocation() {

}
}
// expand project variables
ml = ml.getExpandedLocation(this.getOwner());
// expand upstream project variables
ml = ml.getExpandedLocation(p);
return ml;
}
return null;
@@ -57,9 +57,9 @@ public void testUpStreamURLwithParams()
ParameterDefinition def2 = new StringParameterDefinition("PROJECT", "b");
p.addProperty(new ParametersDefinitionProperty(def1,def2));
FeatureBranchProperty jobProp = new FeatureBranchProperty(p.getName());
p.addProperty(jobProp);
FreeStyleProject p2 = createFreeStyleProject();
p2.addProperty(jobProp);
assertEquals( "https://root/a/b/trunk",jobProp.getUpstreamURL().toDecodedString());

}


0 comments on commit 5da95aa

Please sign in to comment.