From c4927beffe302a6b083a02f154089d8c3df64452 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 9 Oct 2025 10:22:25 +0200 Subject: [PATCH 1/3] [CI] Tag es-pr-check serverless build scans with original PR --- .../groovy/elasticsearch.build-scan.gradle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle index ebb33dbe06884..969439fd453a1 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle @@ -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(' ') @@ -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 } } @@ -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}" + 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()}" From f927c4b0658c4872bf6e6f2fd7bd0618df228b91 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 9 Oct 2025 11:48:29 +0200 Subject: [PATCH 2/3] Fix imports --- .../src/main/groovy/elasticsearch.build-scan.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle index 969439fd453a1..e4e0cdac45b1a 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle @@ -9,9 +9,9 @@ import org.elasticsearch.gradle.OS - import java.lang.management.ManagementFactory import java.time.LocalDateTime +import org.elasticsearch.gradle.Architecture import static org.elasticsearch.gradle.internal.util.CiUtils.safeName From d2a51da19fd962587e8cd45a1738aaddc988fe3b Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 9 Oct 2025 12:16:22 +0200 Subject: [PATCH 3/3] Fix source link pointing to the commit in PR --- .../src/main/groovy/elasticsearch.build-scan.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle index e4e0cdac45b1a..c6496d89dc642 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle @@ -104,7 +104,7 @@ develocity { value 'Git Commit ID', esCommit tag "pr/${esPr}" tag 'pull-request' - link 'Source', "https://github.com/jfreden/elasticsearch/tree/${esCommit}" + 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()