Skip to content

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

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 1 commit into from
Oct 9, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 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,15 +7,13 @@
* 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 org.elasticsearch.gradle.Architecture

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/elastic/elasticsearch/pull/${esPr}/commits/${esCommit}"
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