Use actual current commit id for build scan custom value #52487
Merged
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
Signed-off-by: Mark Vieira <[email protected]>
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
rjernst
reviewed
Feb 18, 2020
gradle/build-scan.gradle
Outdated
| link 'Source', "https://github.com/elastic/elasticsearch/tree/${BuildParams.gitRevision}" | ||
| if (System.getenv('GIT_PREVIOUS_COMMIT')) { | ||
| background { | ||
| def changes = "git diff --name-only ${System.getenv('GIT_PREVIOUS_COMMIT')}..${System.getenv('GIT_COMMIT')}".execute().text.trim() |
Member
There was a problem hiding this comment.
Should the use of GIT_COMMIT here also be replaced with BuildParams.gitRevision?
Contributor
Author
There was a problem hiding this comment.
I didn't change this because GIT_PREVIOUS_COMMIT is subject to the same "problem". I think if anything we might just want to remove this entirely if it's not guaranteed to be accurate.
Contributor
Author
There was a problem hiding this comment.
So yeah, since we can't rely on GIT_COMMIT or GIT_PREVIOUS_COMMIT from Jenkins being actually correct I've just ditched this entirely.
Signed-off-by: Mark Vieira <[email protected]>
mark-vieira
added a commit
that referenced
this pull request
Feb 19, 2020
mark-vieira
added a commit
that referenced
this pull request
Feb 19, 2020
sbourke
pushed a commit
to sbourke/elasticsearch
that referenced
this pull request
Feb 19, 2020
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.
When using runbld with
--last-good-committhe commit id reported by Jenkins via build environment variables is not guaranteed to be correct, and in most cases, it isn't. This is because runbld performs a second checkout during the build execution of the "last good commit".This pull request changes the commit id reported in build scans to the real commit, and not what Jenkins is incorrectly reporting.