Skip to content

Commit 1a00a33

Browse files
committed
Test Spark 4.0
1 parent 8d81a0e commit 1a00a33

File tree

21 files changed

+203
-101
lines changed

21 files changed

+203
-101
lines changed
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
min: &min
1+
2x: &2x
22
spark-version: 2.3.1
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-latest
77

8-
max: &max
8+
3x: &3x
99
spark-version: 3.5.1
1010
pydantic-version: 2
1111
python-version: '3.12'
1212
java-version: 20
1313
os: ubuntu-latest
1414

15+
4x: &4x
16+
spark-version: 4.0.0
17+
pydantic-version: 2
18+
python-version: '3.12'
19+
java-version: 20
20+
os: ubuntu-latest
21+
1522
latest: &latest
1623
spark-version: latest
1724
pydantic-version: latest
@@ -20,6 +27,6 @@ latest: &latest
2027
os: ubuntu-latest
2128

2229
matrix:
23-
small: [*max]
24-
full: [*min, *max]
25-
nightly: [*min, *max, *latest]
30+
small: [*3x]
31+
full: [*2x, *3x, *4x]
32+
nightly: [*2x, *3x, *latest]
Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
1-
min: &min
1+
2x: &2x
22
hadoop-version: hadoop2-hdfs
33
spark-version: 2.3.1
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-latest
88

9-
max: &max
9+
3x: &3x
1010
hadoop-version: hadoop3-hdfs
1111
spark-version: 3.5.1
1212
pydantic-version: 2
1313
python-version: '3.12'
1414
java-version: 20
1515
os: ubuntu-latest
1616

17+
4x: &4x
18+
hadoop-version: hadoop3-hdfs
19+
spark-version: 4.0.0
20+
pydantic-version: 2
21+
python-version: '3.12'
22+
java-version: 20
23+
os: ubuntu-latest
24+
1725
latest: &latest
1826
hadoop-version: hadoop3-hdfs
1927
spark-version: latest
@@ -23,11 +31,6 @@ latest: &latest
2331
os: ubuntu-latest
2432

2533
matrix:
26-
small:
27-
- *max
28-
full:
29-
- *min
30-
- *max
31-
nightly:
32-
- *min
33-
- *latest
34+
small: [*3x]
35+
full: [*2x, *3x, *4x]
36+
nightly: [*2x, *3x, *latest]
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
min: &min
1+
2x: &2x
22
spark-version: 2.3.1
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-latest
77

8-
max: &max
8+
3x: &3x
99
spark-version: 3.5.1
1010
pydantic-version: 2
1111
python-version: '3.12'
1212
java-version: 20
1313
os: ubuntu-latest
1414

15+
4x: &4x
16+
spark-version: 4.0.0
17+
pydantic-version: 2
18+
python-version: '3.12'
19+
java-version: 20
20+
os: ubuntu-latest
21+
1522
latest: &latest
1623
spark-version: latest
1724
pydantic-version: latest
@@ -20,6 +27,6 @@ latest: &latest
2027
os: ubuntu-latest
2128

2229
matrix:
23-
small: [*max]
24-
full: [*min, *max]
25-
nightly: [*min, *latest]
30+
small: [*3x]
31+
full: [*2x, *3x, *4x]
32+
nightly: [*2x, *3x, *latest]
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
min: &min
2-
# Headers are supported only since 2.x.
1+
2x: &2x
2+
# Headers are supported only since Kafka 2x.
33
# Images before 3.2.3 are not creating kafka_jaas.conf properly, and failing to start
44
# https://github.com/bitnami/containers/blob/9db9064668365cac89bff58259f63eb78bb97e79/bitnami/kafka/README.md?plain=1#L933
55
kafka-version: 3.2.3
@@ -9,14 +9,22 @@ min: &min
99
java-version: 8
1010
os: ubuntu-latest
1111

12-
max: &max
12+
3x: &3x
1313
kafka-version: 3.7.1
1414
pydantic-version: 2
1515
spark-version: 3.5.1
1616
python-version: '3.12'
1717
java-version: 20
1818
os: ubuntu-latest
1919

20+
4x: &4x
21+
kafka-version: 3.7.1
22+
pydantic-version: 2
23+
spark-version: 4.0.0
24+
python-version: '3.12'
25+
java-version: 20
26+
os: ubuntu-latest
27+
2028
latest: &latest
2129
kafka-version: latest
2230
pydantic-version: latest
@@ -26,11 +34,6 @@ latest: &latest
2634
os: ubuntu-latest
2735

2836
matrix:
29-
small:
30-
- *max
31-
full:
32-
- *min
33-
- *max
34-
nightly:
35-
- *min
36-
- *latest
37+
small: [*3x]
38+
full: [*2x, *3x, *4x]
39+
nightly: [*2x, *3x, *latest]
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,41 @@
1-
min: &min
1+
23: &23
22
spark-version: 2.3.1
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-latest
77

8-
min_avro: &min_avro
8+
24: &24
9+
# Avro supported only since Spark 2.4
910
spark-version: 2.4.8
1011
pydantic-version: 1
1112
python-version: '3.7'
1213
java-version: 8
1314
os: ubuntu-latest
1415

15-
min_excel: &min_excel
16+
32: &32
17+
# Excel supported only since Spark 3.2
1618
spark-version: 3.2.4
1719
pydantic-version: 1
1820
python-version: '3.7'
1921
java-version: 8
2022
os: ubuntu-latest
2123

22-
max: &max
24+
35: &35
2325
# Excel package currently has no release for 3.5.1
2426
spark-version: 3.5.0
2527
pydantic-version: 2
2628
python-version: '3.12'
2729
java-version: 20
2830
os: ubuntu-latest
2931

32+
4x: &4x
33+
spark-version: 4.0.0
34+
pydantic-version: 2
35+
python-version: '3.12'
36+
java-version: 20
37+
os: ubuntu-latest
38+
3039
latest: &latest
3140
spark-version: latest
3241
pydantic-version: latest
@@ -35,15 +44,6 @@ latest: &latest
3544
os: ubuntu-latest
3645

3746
matrix:
38-
small:
39-
- <<: *max
40-
full:
41-
- <<: *min
42-
- <<: *min_avro
43-
- <<: *min_excel
44-
- <<: *max
45-
nightly:
46-
- <<: *min
47-
- <<: *min_avro
48-
- <<: *min_excel
49-
- <<: *latest
47+
small: [*35]
48+
full: [*23, *24, *32, *35, *4x]
49+
nightly: [*23, *24, *32, *35, *latest]
Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
1-
min: &min
1+
32: &32
22
mongodb-version: 4.0.0
3-
# MongoDB connector does not support Spark 2.x
3+
# MongoDB connector does not support Spark 2x
44
spark-version: 3.2.4
55
pydantic-version: 1
66
python-version: '3.7'
77
java-version: 8
88
os: ubuntu-latest
99

10-
max: &max
10+
35: &35
1111
mongodb-version: 7.0.12
1212
spark-version: 3.5.1
1313
pydantic-version: 2
1414
python-version: '3.12'
1515
java-version: 20
1616
os: ubuntu-latest
1717

18+
4x: &4x
19+
mongodb-version: 7.0.12
20+
spark-version: 4.0.0
21+
pydantic-version: 2
22+
python-version: '3.12'
23+
java-version: 20
24+
os: ubuntu-latest
25+
1826
latest: &latest
1927
mongodb-version: latest
2028
spark-version: latest
@@ -24,6 +32,6 @@ latest: &latest
2432
os: ubuntu-latest
2533

2634
matrix:
27-
small: [*max]
28-
full: [*min, *max]
29-
nightly: [*min, *latest]
35+
small: [*35]
36+
full: [*32, *35, *4x]
37+
nightly: [*32, *35, *latest]
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
1-
min: &min
1+
2x: &2x
22
mssql-version: 2017-GA-ubuntu
33
spark-version: 2.3.1
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-latest
88

9-
max: &max
9+
3x: &3x
1010
mssql-version: 2022-CU14-ubuntu-22.04
1111
spark-version: 3.5.1
1212
pydantic-version: 2
1313
python-version: '3.12'
1414
java-version: 20
1515
os: ubuntu-latest
1616

17+
4x: &4x
18+
mssql-version: 2022-CU14-ubuntu-22.04
19+
spark-version: 4.0.0
20+
pydantic-version: 2
21+
python-version: '3.12'
22+
java-version: 20
23+
os: ubuntu-latest
24+
1725
latest: &latest
1826
mssql-version: latest
1927
spark-version: latest
@@ -23,6 +31,6 @@ latest: &latest
2331
os: ubuntu-latest
2432

2533
matrix:
26-
small: [*max]
27-
full: [*min, *max]
28-
nightly: [*min, *latest]
34+
small: [*3x]
35+
full: [*2x, *3x, *4x]
36+
nightly: [*2x, *3x, *latest]
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
min: &min
1+
2x: &2x
22
# Tags 5.7.6-5.6.12 cannot be downloaded since Docker v26:
33
# "Docker Image Format v1 and Docker Image manifest version 2, schema 1 support is disabled by default"
44
mysql-version: 5.7.13
@@ -8,14 +8,22 @@ min: &min
88
java-version: 8
99
os: ubuntu-latest
1010

11-
max: &max
11+
3x: &3x
1212
mysql-version: 9.0.1
1313
spark-version: 3.5.1
1414
pydantic-version: 2
1515
python-version: '3.12'
1616
java-version: 20
1717
os: ubuntu-latest
1818

19+
4x: &4x
20+
mysql-version: 9.0.1
21+
spark-version: 4.0.0
22+
pydantic-version: 2
23+
python-version: '3.12'
24+
java-version: 20
25+
os: ubuntu-latest
26+
1927
latest: &latest
2028
mysql-version: latest
2129
spark-version: latest
@@ -25,6 +33,6 @@ latest: &latest
2533
os: ubuntu-latest
2634

2735
matrix:
28-
small: [*max]
29-
full: [*min, *max]
30-
nightly: [*min, *latest]
36+
small: [*3x]
37+
full: [*2x, *3x, *4x]
38+
nightly: [*2x, *3x, *latest]

.github/workflows/data/oracle/matrix.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
min: &min
1+
2x: &2x
22
oracle-image: gvenzl/oracle-xe
33
oracle-version: 11.2.0.2-slim-faststart
44
db-name: XE
@@ -8,7 +8,7 @@ min: &min
88
java-version: 8
99
os: ubuntu-latest
1010

11-
max: &max
11+
3x: &3x
1212
oracle-image: gvenzl/oracle-free
1313
oracle-version: 23.4-slim-faststart
1414
db-name: FREEPDB1
@@ -18,6 +18,16 @@ max: &max
1818
java-version: 20
1919
os: ubuntu-latest
2020

21+
4x: &4x
22+
oracle-image: gvenzl/oracle-free
23+
oracle-version: 23.4-slim-faststart
24+
db-name: FREEPDB1
25+
spark-version: 4.0.0
26+
pydantic-version: 2
27+
python-version: '3.12'
28+
java-version: 20
29+
os: ubuntu-latest
30+
2131
latest: &latest
2232
oracle-image: gvenzl/oracle-free
2333
oracle-version: slim-faststart
@@ -29,6 +39,6 @@ latest: &latest
2939
os: ubuntu-latest
3040

3141
matrix:
32-
small: [*max]
33-
full: [*min, *max]
34-
nightly: [*min, *latest]
42+
small: [*3x]
43+
full: [*2x, *3x, *4x]
44+
nightly: [*2x, *3x, *latest]

0 commit comments

Comments
 (0)