From 824fdf06571c18c6074b720e0543e220eabe00b5 Mon Sep 17 00:00:00 2001
From: wforget <643348094@qq.com>
Date: Thu, 28 Mar 2024 18:25:09 +0800
Subject: [PATCH] Fix gluten-it CI and add spark 3.5

---
 .github/workflows/gluten.yml               | 25 +++++++++++++++-------
 integration-tests/kyuubi-gluten-it/pom.xml |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gluten.yml b/.github/workflows/gluten.yml
index b4211266b1d..fde565f5b99 100644
--- a/.github/workflows/gluten.yml
+++ b/.github/workflows/gluten.yml
@@ -56,20 +56,29 @@ jobs:
         id: gluten-cache
         uses: actions/cache@v3
         with:
-          path: gluten/package/target/
-          key: gluten_package_${{ steps.date.outputs.date }}
+          path: gluten/dist/
+          key: gluten_dist_${{ steps.date.outputs.date }}
       - name: Build gluten project
         run: |
           if [[ "${{ steps.gluten-cache.outputs.cache-hit }}" != 'true' ]]; then
             git clone https://github.com/oap-project/gluten.git
             cd gluten
-            ./dev/buildbundle-veloxbe.sh
+            ./dev/builddeps-veloxbe.sh
+            rm -rf dist && mkdir -p dist
+            mvn clean package -Pbackends-velox -Prss -Pspark-3.2 -DskipTests
+            cp package/target/gluten-velox-bundle-spark*.jar dist
+            mvn clean package -Pbackends-velox -Prss -Pspark-3.3 -DskipTests
+            cp package/target/gluten-velox-bundle-spark*.jar dist
+            mvn clean package -Pbackends-velox -Prss -Pspark-3.4 -DskipTests
+            cp package/target/gluten-velox-bundle-spark*.jar dist
+            mvn clean package -Pbackends-velox -Prss -Pspark-3.5 -DskipTests
+            cp package/target/gluten-velox-bundle-spark*.jar dist
           fi
       - uses: actions/cache@v3
         if: steps.gluten-cache.outputs.cache-hit != 'true'
         with:
-          path: gluten/package/target/
-          key: gluten_package_${{ steps.date.outputs.date }}
+          path: gluten/dist/
+          key: gluten_dist_${{ steps.date.outputs.date }}
 
   gluten-it:
     name: Gluten Integration TPC-H/DS Test
@@ -78,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        spark: [ '3.4', '3.3' ]
+        spark: [ '3.5', '3.4', '3.3' ]
     steps:
       - uses: actions/checkout@v4
       - name: Free up disk space
@@ -101,8 +110,8 @@ jobs:
         id: gluten-cache
         uses: actions/cache@v3
         with:
-          path: gluten/package/target/
-          key: gluten_package_${{ steps.date.outputs.date }}
+          path: gluten/dist/
+          key: gluten_dist_${{ steps.date.outputs.date }}
       - name: Setup JDK 8
         uses: actions/setup-java@v4
         with:
diff --git a/integration-tests/kyuubi-gluten-it/pom.xml b/integration-tests/kyuubi-gluten-it/pom.xml
index be72e129b98..b82a272b287 100644
--- a/integration-tests/kyuubi-gluten-it/pom.xml
+++ b/integration-tests/kyuubi-gluten-it/pom.xml
@@ -40,7 +40,7 @@
             <artifactId>${gluten.artifact.name}</artifactId>
             <version>${gluten.version}</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/../../gluten/package/target/${gluten.artifact.name}_x86_64-${gluten.version}.jar</systemPath>
+            <systemPath>${project.basedir}/../../gluten/dist/${gluten.artifact.name}_x86_64-${gluten.version}.jar</systemPath>
         </dependency>
 
         <dependency>