Adjust test-docker release branch check for Jenkins quirk #26391
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.
Fix the check in
util/cron/test-docker.bash
that ensures we're working from the desired release branch when in release mode.When run in the Jenkins job, this check failed despite having the correct revision checked out. This is because for some reason Jenkins (or the SCM plugin we use, or JJB, not sure) takes the branch you ask to check out, manually dereferences it to the commit it points to, and then checks out that commit by SHA. So
HEAD
points to a SHA rather than the branch name, andgit rev-parse --abbrev-ref HEAD
just returnsHEAD
.Fixed by comparing the SHA of
HEAD
against the SHA of the desired branch directly.[trivial, not reviewed]
Testing:
test-docker.bash
in release mode