Skip to content

Use actual current commit id for build scan custom value #52487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Use actual current commit id for build scan custom value #52487

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd5603f
Use actual current commit id for build scan custom value
mark-vieira Feb 18, 2020
45992f7
Remove usages on unreliable GIT_PREVIOUS_COMMIT env variable
mark-vieira Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions gradle/build-scan.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.elasticsearch.gradle.OS
import org.elasticsearch.gradle.info.BuildParams
import org.gradle.initialization.BuildRequestMetaData

import java.util.concurrent.TimeUnit
Expand Down Expand Up @@ -76,9 +77,9 @@ buildScan {
value 'Git Branch', branch
tag branch
}
if (System.getenv('GIT_COMMIT')) {
value 'Git Commit ID', System.getenv('GIT_COMMIT')
link 'Source', "https://github.com/elastic/elasticsearch/tree/${System.getenv('GIT_COMMIT')}"
value 'Git Commit ID', BuildParams.gitRevision
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()
Copy link
Member

@rjernst rjernst Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the use of GIT_COMMIT here also be replaced with BuildParams.gitRevision?

Copy link
Contributor Author

@mark-vieira mark-vieira Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

@mark-vieira mark-vieira Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

value 'Git Changes', changes
Expand Down