Skip to content

[CI] Tag es-pr-check serverless build scans with original PR #136257

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 3 commits into from
Oct 9, 2025
Merged

[CI] Tag es-pr-check serverless build scans with original PR #136257

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4927be
[CI] Tag es-pr-check serverless build scans with original PR
breskeby Oct 9, 2025
f927c4b
Fix imports
breskeby Oct 9, 2025
d2a51da
Fix source link pointing to the commit in PR
breskeby Oct 9, 2025
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
19 changes: 13 additions & 6 deletions build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import java.lang.management.ManagementFactory;
import java.time.LocalDateTime;

import org.elasticsearch.gradle.Architecture
import org.elasticsearch.gradle.OS
import static org.elasticsearch.gradle.internal.util.CiUtils.safeName

import java.lang.management.ManagementFactory
import java.time.LocalDateTime

import static org.elasticsearch.gradle.internal.util.CiUtils.safeName

// Resolving this early to avoid issues with the build scan plugin in combination with the configuration cache usage
def taskNames = gradle.startParameter.taskNames.join(' ')

Expand All @@ -32,10 +30,10 @@ develocity {
// Automatically publish scans from Elasticsearch CI
if (onCI) {
publishing.onlyIf { true }
if(server.isPresent() == false) {
if (server.isPresent() == false) {
server = 'https://gradle-enterprise.elastic.co'
}
} else if( server.isPresent() == false) {
} else if (server.isPresent() == false) {
publishing.onlyIf { false }
}

Expand Down Expand Up @@ -99,6 +97,15 @@ develocity {
tag 'pull-request'
link 'Source', "${prBaseUrl}/tree/${System.getenv('BUILDKITE_COMMIT')}"
link 'Pull Request', "https://github.com/${repository}/pull/${prId}"
} else if (System.getenv('ELASTICSEARCH_PR_NUMBER')) {
// For tracking es-pr-check failures in the serverless repo caused by elasticsearch PRs
def esPr = System.getenv('ELASTICSEARCH_PR_NUMBER')
def esCommit = System.getenv('ELASTICSEARCH_SUBMODULE_COMMIT')
value 'Git Commit ID', esCommit
tag "pr/${esPr}"
tag 'pull-request'
link 'Source', "https://github.com/jfreden/elasticsearch/tree/${esCommit}"
Copy link
Contributor

Choose a reason for hiding this comment

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

The "source" link should dynamically point to the commit in the PR source repo.
However, I'm not sure we can get the PR source as BUILDKITE_PULL_REQUEST_REPO is empty in the es-pr-check builds I've checked.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch. I changed it to just point to the commit in the context of the PR

link 'Pull Request', "https://github.com/elastic/elasticsearch/pull/${esPr}"
} else {
value 'Git Commit ID', gitRevision.get()
link 'Source', "https://github.com/${repository}/tree/${gitRevision.get()}"
Expand Down