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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test with Spark RC #135

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Test with Spark RC #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c431bd
Test Spark 3.3.2 RC1
EnricoMi Feb 12, 2023
cbe0043
Add test for Spark 3.4.0 RC1
EnricoMi Feb 22, 2023
91c9174
Install PySpark from URL
EnricoMi Feb 22, 2023
7009b57
Remove PySpark 3.3 from testing
EnricoMi Feb 22, 2023
c26b2da
Fix test action
EnricoMi Feb 22, 2023
eb1ef17
Test RC3
EnricoMi Mar 9, 2023
64cd47d
Test 3.5.2 RC1
EnricoMi Jul 18, 2024
9db5992
Merge remote-tracking branch 'origin/master' into branch-test-spark-rc
EnricoMi Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/test-jvm/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ runs:
- name: Setup Spark Binaries
if: ( ! contains(inputs.spark-version, '-SNAPSHOT') )
env:
SPARK_PACKAGE: spark-${{ inputs.spark-version }}/spark-${{ inputs.spark-version }}-bin-hadoop${{ inputs.hadoop-version }}${{ inputs.scala-compat-version == '2.13' && '-scala2.13' || '' }}.tgz
SPARK_PACKAGE: spark-${{ inputs.spark-version }}-bin-hadoop${{ inputs.hadoop-version }}${{ inputs.scala-compat-version == '2.13' && '-scala2.13' || '' }}.tgz
run: |
if [[ ! -e ~/spark ]]
then
wget --progress=dot:giga "https://www.apache.org/dyn/closer.lua/spark/${SPARK_PACKAGE}?action=download" -O - | tar -xzC "${{ runner.temp }}"
wget --progress=dot:giga "https://dist.apache.org/repos/dist/dev/spark/v3.5.2-rc1-bin/${SPARK_PACKAGE}" -O - | tar -xzC "${{ runner.temp }}"
archive=$(basename "${SPARK_PACKAGE}") bash -c "mv -v "${{ runner.temp }}/\${archive/%.tgz/}" ~/spark"
fi
echo "SPARK_HOME=$(cd ~/spark; pwd)" >> $GITHUB_ENV
Expand Down
9 changes: 9 additions & 0 deletions .github/actions/test-python/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ inputs:
python-version:
description: Python version, e.g. 3.8
required: true
pyspark-url:
description: URL to install PySpark from
required: false

runs:
using: 'composite'
Expand Down Expand Up @@ -67,6 +70,12 @@ runs:
with:
python-version: ${{ inputs.python-version }}

- name: Install PySpark from url
if: inputs.pyspark-url != ''
run: |
pip install ${{ inputs.pyspark-url }}
shell: bash

- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
Expand Down
36 changes: 2 additions & 34 deletions .github/workflows/build-jvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,47 +12,15 @@ jobs:
fail-fast: false
matrix:
include:
- spark-compat-version: '3.0'
spark-version: '3.0.3'
scala-compat-version: '2.12'
scala-version: '2.12.10'
- spark-compat-version: '3.1'
spark-version: '3.1.3'
scala-compat-version: '2.12'
scala-version: '2.12.10'
- spark-compat-version: '3.2'
spark-version: '3.2.4'
scala-compat-version: '2.12'
scala-version: '2.12.15'
- spark-compat-version: '3.3'
spark-version: '3.3.4'
scala-compat-version: '2.12'
scala-version: '2.12.15'
- spark-compat-version: '3.4'
scala-compat-version: '2.12'
scala-version: '2.12.17'
spark-version: '3.4.2'
- spark-compat-version: '3.5'
scala-compat-version: '2.12'
scala-version: '2.12.18'
spark-version: '3.5.1'
spark-version: '3.5.2'

- spark-compat-version: '3.2'
spark-version: '3.2.4'
scala-compat-version: '2.13'
scala-version: '2.13.5'
- spark-compat-version: '3.3'
spark-version: '3.3.4'
scala-compat-version: '2.13'
scala-version: '2.13.8'
- spark-compat-version: '3.4'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-version: '3.4.2'
- spark-compat-version: '3.5'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-version: '3.5.1'
spark-version: '3.5.2'

steps:
- name: Checkout
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
build-jvm:
name: "Build JVM"
uses: "./.github/workflows/build-jvm.yml"
build-snapshots:
name: "Build Snapshots"
uses: "./.github/workflows/build-snapshots.yml"
build-python:
name: "Build Python"
needs: build-jvm
Expand All @@ -42,10 +39,6 @@ jobs:
name: "Test Python"
needs: build-jvm
uses: "./.github/workflows/test-python.yml"
test-snapshots-jvm:
name: "Test Snapshots"
needs: build-snapshots
uses: "./.github/workflows/test-snapshots.yml"

check:
name: "Check"
Expand All @@ -55,7 +48,7 @@ jobs:
test_success:
name: "Test success"
runs-on: ubuntu-latest
needs: [build-python, test-jvm, test-python, test-snapshots-jvm]
needs: [build-python, test-jvm, test-python]

steps:
- name: Noop
Expand Down
99 changes: 2 additions & 97 deletions .github/workflows/test-jvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,112 +11,17 @@ jobs:
strategy:
fail-fast: false
matrix:
scala-compat-version: ['2.12', '2.13']
spark-compat-version: ['3.2', '3.3']
spark-patch-version: ['0', '1', '2', '3']

include:
- spark-compat-version: '3.0'
scala-compat-version: '2.12'
scala-version: '2.12.10'
spark-patch-version: '3'
hadoop-version: '2.7'
- spark-compat-version: '3.1'
scala-compat-version: '2.12'
scala-version: '2.12.10'
spark-patch-version: '3'
hadoop-version: '2.7'
- spark-compat-version: '3.2'
scala-compat-version: '2.12'
scala-version: '2.12.15'
hadoop-version: '2.7'
- spark-compat-version: '3.2'
scala-compat-version: '2.12'
scala-version: '2.12.15'
spark-patch-version: '4'
hadoop-version: '2.7'
- spark-compat-version: '3.3'
scala-compat-version: '2.12'
scala-version: '2.12.15'
hadoop-version: '2'
- spark-compat-version: '3.3'
scala-compat-version: '2.12'
scala-version: '2.12.15'
spark-patch-version: '3'
hadoop-version: '3'
- spark-compat-version: '3.3'
scala-compat-version: '2.12'
scala-version: '2.12.15'
spark-patch-version: '4'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.12'
scala-version: '2.12.17'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.12'
scala-version: '2.12.17'
spark-patch-version: '1'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.12'
scala-version: '2.12.17'
spark-patch-version: '2'
hadoop-version: '3'
- spark-compat-version: '3.5'
scala-compat-version: '2.12'
scala-version: '2.12.18'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.5'
scala-compat-version: '2.12'
scala-version: '2.12.18'
spark-patch-version: '1'
hadoop-version: '3'

- spark-compat-version: '3.2'
scala-compat-version: '2.13'
scala-version: '2.13.5'
hadoop-version: '3.2'
- spark-compat-version: '3.2'
scala-compat-version: '2.13'
scala-version: '2.13.5'
spark-patch-version: '4'
hadoop-version: '3.2'
- spark-compat-version: '3.3'
scala-compat-version: '2.13'
scala-version: '2.13.8'
hadoop-version: '3'
- spark-compat-version: '3.3'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '4'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '1'
hadoop-version: '3'
- spark-compat-version: '3.4'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '2'
hadoop-version: '3'

- spark-compat-version: '3.5'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.5'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '1'
spark-patch-version: '2'
hadoop-version: '3'

steps:
Expand Down
28 changes: 4 additions & 24 deletions .github/workflows/test-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,15 @@ jobs:
strategy:
fail-fast: false
matrix:
spark-compat-version: ['3.2', '3.3', '3.4', '3.5']
spark-compat-version: ['3.5']
python-version: ['3.8', '3.9', '3.10']

include:
- spark-compat-version: '3.0'
spark-version: '3.0.3'
scala-compat-version: '2.12'
scala-version: '2.12.10'
python-version: '3.8'
- spark-compat-version: '3.1'
spark-version: '3.1.3'
scala-compat-version: '2.12'
scala-version: '2.12.10'
python-version: '3.8'
- spark-compat-version: '3.2'
spark-version: '3.2.4'
scala-compat-version: '2.12'
scala-version: '2.12.15'
- spark-compat-version: '3.3'
spark-version: '3.3.4'
scala-compat-version: '2.12'
scala-version: '2.12.15'
- spark-compat-version: '3.4'
spark-version: '3.4.2'
scala-compat-version: '2.12'
scala-version: '2.12.17'
- spark-compat-version: '3.5'
spark-version: '3.5.1'
spark-version: '3.5.2'
scala-compat-version: '2.12'
scala-version: '2.12.18'
url: 'https://dist.apache.org/repos/dist/dev/spark/v3.5.2-rc1-bin/pyspark-3.5.2.tar.gz'

steps:
- name: Checkout
Expand All @@ -56,3 +35,4 @@ jobs:
spark-compat-version: ${{ matrix.spark-compat-version }}
scala-compat-version: ${{ matrix.scala-compat-version }}
python-version: ${{ matrix.python-version }}
pyspark-url: ${{ matrix.url }}
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@
<name>Apache Snapshots</name>
<url>https://repository.apache.org/snapshots/</url>
</repository>
<!-- required to resolve Spark RC candidates -->
<repository>
<id>apache-spark-3.5.2-rc1</id>
<name>Apache Spark 3.5.2 RC1</name>
<url>https://repository.apache.org/content/repositories/orgapachespark-1457/</url>
</repository>
</repositories>

<distributionManagement>
Expand Down
Loading