[JENKINS-57371] - Enable graceful fallback for merge hash #226
Conversation
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
bitwiseman
force-pushed
the
JENKINS-57371
branch
7 times, most recently
from
e6d4cda to
0ae74a0
Compare
bitwiseman
commented
May 22, 2019
| if (pr.getMergeable() != null) { | ||
| mergeHash = Boolean.TRUE.equals(pr.getMergeable()) ? pr.getMergeCommitSha() : PullRequestSCMRevision.NOT_MERGEABLE_HASH; | ||
|
|
||
| if (prhead.isMerge()) { |
There was a problem hiding this comment.
Before we would validate the merge later. Now we do a bunch of work to make the merge valid or to ignore it.
bitwiseman
commented
May 22, 2019
| if (parents.size() != 2 || !parents.contains(this.getBaseHash()) || !parents.contains(this.getPullHash())) { | ||
| throw new AbortException("Invalid merge hash for pull request " + ((PullRequestSCMHead)this.getHead()).getNumber() + " : Head and base commits do match merge commit " + this.toString() ); | ||
| } | ||
| void validateMergeHash() throws AbortException { |
There was a problem hiding this comment.
As noted, this validation used to be called in several places and be super strict. Now the checks are done at create time and additional work is done then to make the merge hash valid or to make it null (which case the FileSource will fall back to clone and merge locally).
bitwiseman
commented
May 22, 2019
src/test/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevisionTest.java
Outdated
Show resolved
Hide resolved
bitwiseman
commented
May 22, 2019
src/test/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevisionTest.java
Outdated
Show resolved
Hide resolved
bitwiseman
commented
May 22, 2019
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTest.java
Outdated
Show resolved
Hide resolved
bitwiseman
commented
May 22, 2019
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTest.java
Outdated
Show resolved
Hide resolved
bitwiseman
changed the title
We tried using strict merge commit handling to prevent cloning on master. This resulted in some edge cases for some users where PRs would simply not build and there was not viable workaround. Change: * Merge hash has been changed to best effort. If it is missing or inconsistent, Jenkins will gracefully revert to cloning on master. * Most validity checking for merge hash has been moved to create time. * Plugin tries harder than before to create a valid merge hash revision.
kshultzCB
approved these changes
May 23, 2019
abayer
approved these changes
May 23, 2019
Though most of the time I'm wondering why those comments aren't in the code instead. |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
We tried using strict merge commit handling to prevent cloning on master.
This resulted in some edge cases for some users where PRs would simply not build
and there was not viable workaround.
Change:
Jenkins will gracefully revert to cloning on master.
https://issues.jenkins-ci.org/browse/JENKINS-57371