Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Fix Gluten IT CI and add Spark 3.5 #6224

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[WIP] Fix Gluten IT CI and add Spark 3.5 #6224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions .github/workflows/gluten.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
git clone https://github.com/oap-project/gluten.git
git clone https://github.com/apache/incubator-gluten.git

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait for apache/incubator-gluten#5193

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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/kyuubi-gluten-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down