From 956f641f578d29840f477c2cf1cd541ba272bcb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= <helder.gregorio@dremio.com>
Date: Fri, 12 Jun 2026 23:17:30 +0100
Subject: [PATCH] MINOR: Reuse Maven build outputs in CI tests

---
 .github/workflows/test.yml | 16 ++++------------
 ci/scripts/build.sh        | 10 ++++++++--
 ci/scripts/test.sh         |  6 +++---
 compose.yaml               |  6 ++----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c437a056d..26c0da7a3e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -104,16 +104,12 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
-      - name: Build
+      - name: Build and Test
         shell: bash
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          ARROW_JAVA_BUILD_SKIP_TESTS: "OFF"
         run: ci/scripts/build.sh . build jni
-      - name: Test
-        shell: bash
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-        run: ci/scripts/test.sh . build jni
 
   windows:
     name: AMD64 Windows Server 2022 Java JDK ${{ matrix.jdk }}
@@ -135,16 +131,12 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
-      - name: Build
+      - name: Build and Test
         shell: bash
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          ARROW_JAVA_BUILD_SKIP_TESTS: "OFF"
         run: ci/scripts/build.sh . build jni
-      - name: Test
-        shell: bash
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-        run: ci/scripts/test.sh . build jni
 
   integration:
     name: AMD64 integration
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index 146a40cf7a..74f7a332e3 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -23,11 +23,17 @@ if [[ "${ARROW_JAVA_BUILD:-ON}" != "ON" ]]; then
   exit
 fi
 
-source_dir=${1}
+source_dir="$(cd "${1}" && pwd)"
 build_dir=${2}
 java_jni_dist_dir=${3}
 
-mvn="mvn -B -DskipTests -Drat.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+mvn="mvn -B -Drat.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+
+if [ "${ARROW_JAVA_BUILD_SKIP_TESTS:-ON}" = "ON" ]; then
+  mvn="${mvn} -DskipTests"
+else
+  mvn="${mvn} -Darrow.test.dataRoot=${source_dir}/testing/data"
+fi
 
 if [ "${ARROW_JAVA_SKIP_GIT_PLUGIN:-OFF}" = "ON" ]; then
   mvn="${mvn} -Dmaven.gitcommitid.skip=true"
diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index cacc20034e..5d69a03b04 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -37,7 +37,7 @@ mvn="${mvn} -T 2C"
 
 pushd "${build_dir}"
 
-${mvn} -Darrow.test.dataRoot="${source_dir}/testing/data" clean test
+${mvn} -Darrow.test.dataRoot="${source_dir}/testing/data" test
 
 projects=()
 if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
@@ -46,7 +46,7 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
   projects+=(gandiva)
 fi
 if [ "${#projects[@]}" -gt 0 ]; then
-  ${mvn} clean test \
+  ${mvn} test \
     -Parrow-jni \
     -pl "$(
       IFS=,
@@ -56,7 +56,7 @@ if [ "${#projects[@]}" -gt 0 ]; then
 fi
 
 if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then
-  ${mvn} clean test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir="${java_jni_dist_dir}"
+  ${mvn} test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir="${java_jni_dist_dir}"
 fi
 
 popd
diff --git a/compose.yaml b/compose.yaml
index 4fd825e5a5..4f465dcc62 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -47,8 +47,7 @@ services:
       - ${DOCKER_VOLUME_PREFIX}maven-cache:/root/.m2:delegated
     command:
       /bin/bash -c "
-        /arrow-java/ci/scripts/build.sh /arrow-java /build /jni &&
-        /arrow-java/ci/scripts/test.sh /arrow-java /build /jni"
+        ARROW_JAVA_BUILD_SKIP_TESTS=OFF /arrow-java/ci/scripts/build.sh /arrow-java /build /jni"
 
   conda-jni-cdata:
     # Builds and tests just the C Data Interface JNI library and JARs.
@@ -81,8 +80,7 @@ services:
     command:
       /bin/bash -c "
         /arrow-java/ci/scripts/jni_build.sh /arrow-java /build/jni /build /jni &&
-        /arrow-java/ci/scripts/build.sh /arrow-java /build /jni &&
-        /arrow-java/ci/scripts/test.sh /arrow-java /build /jni"
+        ARROW_JAVA_BUILD_SKIP_TESTS=OFF /arrow-java/ci/scripts/build.sh /arrow-java /build /jni"
 
   vcpkg-jni:
     # Builds all the JNI libraries, but not the JARs.