[JENKINS-42971] GitSCMFileSystem consumes environment and expands branch name #1305
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ | |
| import hudson.EnvVars; | ||
| import hudson.Extension; | ||
| import hudson.model.Item; | ||
| import hudson.model.Run; | ||
| import hudson.model.TaskListener; | ||
| import hudson.plugins.git.BranchSpec; | ||
| import hudson.plugins.git.GitException; | ||
|
|
@@ -284,14 +285,16 @@ public boolean supportsDescriptor(SCMSourceDescriptor descriptor) { | |
| } | ||
|
|
||
| @Override | ||
| public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull SCMRevision rev, | ||
| @CheckForNull Run<?,?> _build) | ||
| throws IOException, InterruptedException { | ||
| if (rev != null && !(rev instanceof AbstractGitSCMSource.SCMRevisionImpl)) { | ||
| return null; | ||
| } | ||
| if (!(scm instanceof GitSCM)) { | ||
| return null; // Spotbugs warns about unchecked cast without this check | ||
| } | ||
|
|
||
MartinKosicky marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| GitSCM gitSCM = (GitSCM) scm; | ||
| UserRemoteConfig config = gitSCM.getUserRemoteConfigs().get(0); | ||
| BranchSpec branchSpec = gitSCM.getBranches().get(0); | ||
|
|
@@ -301,6 +304,13 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull | |
| listener.getLogger().println("Git remote url is null"); | ||
| return null; | ||
| } | ||
|
|
||
| EnvVars env = null; | ||
| if (_build != null) | ||
| { | ||
MartinKosicky marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| env = _build.getEnvironment(listener); | ||
| } | ||
|
|
||
| String cacheEntry = AbstractGitSCMSource.getCacheEntry(remote); | ||
| Lock cacheLock = AbstractGitSCMSource.getCacheLock(cacheEntry); | ||
| cacheLock.lock(); | ||
|
|
@@ -353,12 +363,17 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull | |
| if (rev != null) { | ||
| headName = rev.getHead().getName(); | ||
| } else { | ||
| String branchSpecExpandedName = branchSpec.getName(); | ||
| if (env != null) { | ||
| branchSpecExpandedName = env.expand(branchSpecExpandedName); | ||
| } | ||
|
|
||
| if (branchSpecExpandedName.startsWith(prefix)){ | ||
| headName = branchSpecExpandedName.substring(prefix.length()); | ||
| } else if (branchSpecExpandedName.startsWith("*/")) { | ||
| headName = branchSpecExpandedName.substring(2); | ||
| } else { | ||
| headName = branchSpecExpandedName; | ||
| } | ||
| } | ||
| client.fetch_().prune(true).from(remoteURI, Arrays | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update
git-plugin/pom.xml
Line 78 in d7159dc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok i updated it, I hope correctly