From c4fe830f8853a384c8efe9e094a48ce62a74991c Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Tue, 10 Jun 2025 10:15:17 +0200 Subject: [PATCH 1/2] [Build] Build maven aggregation zip as part of DRA build --- .buildkite/scripts/dra-workflow.sh | 1 + build.gradle | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.buildkite/scripts/dra-workflow.sh b/.buildkite/scripts/dra-workflow.sh index 5e88a7be430af..c3473a645c74b 100755 --- a/.buildkite/scripts/dra-workflow.sh +++ b/.buildkite/scripts/dra-workflow.sh @@ -71,6 +71,7 @@ echo --- Building release artifacts buildReleaseArtifacts \ exportCompressedDockerImages \ exportDockerContexts \ + :zipAggregation \ :distribution:generateDependenciesReport PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script diff --git a/build.gradle b/build.gradle index ed344b04a58f6..36ef7b0b7fa37 100644 --- a/build.gradle +++ b/build.gradle @@ -68,6 +68,9 @@ nmcpAggregation { } tasks.named('zipAggregation').configure { + archiveFileName.unset(); + archiveBaseName.set("elasticsearch-maven-aggregration") + archiveVersion.set(VersionProperties.elasticsearch) dependsOn gradle.includedBuild('build-tools').task(':zipElasticPublication') from(zipTree(gradle.includedBuild('build-tools').task(':zipElasticPublication').resolveTask().archiveFile.get())) } From fc2f36fd8bcd5aa0fff876dd774b4a85eb9e4bff Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 11 Jun 2025 11:36:17 +0200 Subject: [PATCH 2/2] Update path for aggregation zip --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 36ef7b0b7fa37..51158baf2e202 100644 --- a/build.gradle +++ b/build.gradle @@ -68,9 +68,12 @@ nmcpAggregation { } tasks.named('zipAggregation').configure { + // put this in a place that works well with our DRA infrastructure archiveFileName.unset(); - archiveBaseName.set("elasticsearch-maven-aggregration") + archiveBaseName.set("elasticsearch-maven-aggregation") archiveVersion.set(VersionProperties.elasticsearch) + destinationDirectory.set(layout.buildDirectory.dir("distributions")); + dependsOn gradle.includedBuild('build-tools').task(':zipElasticPublication') from(zipTree(gradle.includedBuild('build-tools').task(':zipElasticPublication').resolveTask().archiveFile.get())) }