From 8dcb1f26c82968b15b982687f75fc67f338cd632 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Wed, 11 Jun 2025 18:11:27 +0200
Subject: [PATCH] [Build] Build maven aggregation zip as part of DRA build
 (#129175)

* [Build] Build maven aggregation zip as part of DRA build

* Update path for aggregation zip

(cherry picked from commit 4c21fbfb8a0e7ec8390749a8c5d4b04f779248eb)

# Conflicts:
#	.buildkite/scripts/dra-workflow.sh
---
 .buildkite/scripts/dra-workflow.sh | 1 +
 build.gradle                       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.buildkite/scripts/dra-workflow.sh b/.buildkite/scripts/dra-workflow.sh
index 81b8225e443a4..91156de877be4 100755
--- a/.buildkite/scripts/dra-workflow.sh
+++ b/.buildkite/scripts/dra-workflow.sh
@@ -58,6 +58,7 @@ echo --- Building release artifacts
   $BUILD_SNAPSHOT_ARG \
   buildReleaseArtifacts \
   exportCompressedDockerImages \
+  :zipAggregation \
   :distribution:generateDependenciesReport
 
 PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script
diff --git a/build.gradle b/build.gradle
index 3e9482ce1cd96..7db833eb9fe02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,12 @@ nmcpAggregation {
 }
 
 tasks.named('zipAggregation').configure {
+  // put this in a place that works well with our DRA infrastructure
+  archiveFileName.unset();
+  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()))
 }