Fix build

apache · Aug 20, 2024 · 522b083 · 522b083
1 parent 81b3076
commit 522b083
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/velox_docker.yml b/.github/workflows/velox_docker.yml
@@ -592,7 +592,7 @@ jobs:
           GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
             --local --preset=velox-with-celeborn --benchmark-type=ds --error-on-memleak --off-heap-size=10g -s=1.0 --threads=8 --iterations=1
 
-  Run CPP unit/benchmark test & UDF test:
+  run-CPP-test-UDF-test:
     runs-on: ubuntu-20.04
     container: ghcr.io/facebookincubator/velox-dev:centos8
     steps:
@@ -620,15 +620,15 @@ jobs:
           cd ./cpp/build && ctest -V
       - name: Run CPP benchmark test
         run: |
-          mvn test -Pspark-3.2 -Pbackends-velox -Pceleborn -pl backends-velox -am \
-          -DtagsToInclude="org.apache.gluten.tags.GenerateExample" -Dtest=none \
-          -DfailIfNoTests=false -Dexec.skip
+          $MVN_CMD test -Pspark-3.5 -Pbackends-velox -pl backends-velox -am \
+          -DtagsToInclude="org.apache.gluten.tags.GenerateExample" -Dtest=none -DfailIfNoTests=false -Dexec.skip
           # This test depends on example.json generated by the above mvn test.
           cd cpp/build/velox/benchmarks && sudo chmod +x ./generic_benchmark
           ./generic_benchmark --run-example --with-shuffle --threads 1 --iterations 1
       - name: Run UDF test
+        run: |
           # Depends on --build_example=ON.
-          $MVN_CMD test -Pspark-3.2 -Pbackends-velox -Piceberg -Pdelta -DtagsToExclude=None \
+          $MVN_CMD test -Pspark-3.5 -Pbackends-velox -Piceberg -Pdelta -DtagsToExclude=None \
           -DtagsToInclude=org.apache.gluten.tags.UDFTest
 #      - uses: actions/upload-artifact@v2
 #        with:
@@ -905,7 +905,7 @@ jobs:
       - name: Build and Run unit test for Spark 3.3.1 (slow tests)
         run: |
           cd $GITHUB_WORKSPACE/
-          $MVN_CMD clean install -Pspark-3.3 -Pbackends-velox -Pceleborn -Piceberg -Pdelta -Pspark-ut 
+          $MVN_CMD clean install -Pspark-3.3 -Pbackends-velox -Pceleborn -Piceberg -Pdelta -Pspark-ut \
           -DargLine="-Dspark.test.home=$GITHUB_WORKSPACE//shims/spark33/spark_home/" \
           -DtagsToInclude=org.apache.spark.tags.ExtendedSQLTest
 

diff --git a/dev/ci-velox-buildshared-centos-8.sh b/dev/ci-velox-buildshared-centos-8.sh
@@ -10,6 +10,7 @@ yum install sudo patch java-1.8.0-openjdk-devel wget -y
 wget https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
 tar -xvf apache-maven-3.8.8-bin.tar.gz && mv apache-maven-3.8.8 /usr/lib/maven
 export PATH="${PATH}:/usr/lib/maven/bin"
+echo "PATH=${PATH}:/usr/lib/maven/bin" >> $GITHUB_ENV
 
 source /opt/rh/gcc-toolset-9/enable
 ./dev/builddeps-veloxbe.sh --run_setup_script=OFF --enable_ep_cache=OFF --build_tests=ON \