From e63feb48fc4c0888e834606259e0ddfc8c2d6877 Mon Sep 17 00:00:00 2001
From: chrislu <chris.lu@gmail.com>
Date: Sat, 22 Nov 2025 13:14:52 -0800
Subject: [PATCH] ci: fix Maven artifact restoration in workflow

- Add step to restore Maven artifacts from download to ~/.m2/repository
- Restructure artifact upload to use consistent directory layout
- Remove obsolete 'version' field from docker-compose.yml to eliminate warnings
- Ensures SeaweedFS Java dependencies are available during test execution
---
 .github/workflows/spark-integration-tests.yml | 37 +++++++++++++++++--
 test/java/spark/docker-compose.yml            |  2 -
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/spark-integration-tests.yml b/.github/workflows/spark-integration-tests.yml
index e617fd5a3..36b084b37 100644
--- a/.github/workflows/spark-integration-tests.yml
+++ b/.github/workflows/spark-integration-tests.yml
@@ -75,13 +75,20 @@ jobs:
         mvn clean install -DskipTests -Dgpg.skip=true
         echo "✓ HDFS3 client built"
 
+    - name: Prepare artifacts for upload
+      run: |
+        echo "Preparing artifacts for upload..."
+        mkdir -p artifacts/docker
+        mkdir -p artifacts/.m2/repository/com
+        cp docker/weed artifacts/docker/
+        cp -r ~/.m2/repository/com/seaweedfs artifacts/.m2/repository/com/
+        echo "✓ Artifacts prepared"
+
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
         name: seaweedfs-build
-        path: |
-          docker/weed
-          ~/.m2/repository/com/seaweedfs
+        path: artifacts/
         retention-days: 1
 
   spark-tests:
@@ -106,6 +113,18 @@ jobs:
         name: seaweedfs-build
         path: .
 
+    - name: Restore Maven repository
+      run: |
+        echo "Restoring Maven artifacts to ~/.m2/repository..."
+        mkdir -p ~/.m2/repository/com
+        if [ -d ".m2/repository/com/seaweedfs" ]; then
+          cp -r .m2/repository/com/seaweedfs ~/.m2/repository/com/
+          echo "✓ Maven artifacts restored"
+        else
+          echo "⚠️ Warning: Maven artifacts not found in download"
+          ls -la
+        fi
+
     - name: Start SeaweedFS services
       working-directory: test/java/spark
       run: |
@@ -213,6 +232,18 @@ jobs:
         name: seaweedfs-build
         path: .
 
+    - name: Restore Maven repository
+      run: |
+        echo "Restoring Maven artifacts to ~/.m2/repository..."
+        mkdir -p ~/.m2/repository/com
+        if [ -d ".m2/repository/com/seaweedfs" ]; then
+          cp -r .m2/repository/com/seaweedfs ~/.m2/repository/com/
+          echo "✓ Maven artifacts restored"
+        else
+          echo "⚠️ Warning: Maven artifacts not found in download"
+          ls -la
+        fi
+
     - name: Cache Apache Spark
       id: cache-spark
       uses: actions/cache@v4
diff --git a/test/java/spark/docker-compose.yml b/test/java/spark/docker-compose.yml
index 9a0837fc1..b25704709 100644
--- a/test/java/spark/docker-compose.yml
+++ b/test/java/spark/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   seaweedfs-master:
     build: