Skip to content

Commit 73cbf88

Browse files
authored
[VL][CI] Migrate Spark 4.1 tests to CentOS 9 (#11519)
1 parent 24b8c76 commit 73cbf88

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.github/workflows/velox_backend_x86.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ jobs:
14251425
runs-on: ubuntu-22.04
14261426
env:
14271427
SPARK_TESTING: true
1428-
container: apache/gluten:centos-8-jdk17
1428+
container: apache/gluten:centos-9-jdk17
14291429
steps:
14301430
- uses: actions/checkout@v2
14311431
- name: Download All Artifacts
@@ -1440,8 +1440,10 @@ jobs:
14401440
path: /root/.m2/repository/org/apache/arrow/
14411441
- name: Prepare
14421442
run: |
1443-
dnf module -y install python39 && \
1444-
alternatives --set python3 /usr/bin/python3.9 && \
1443+
dnf install -y python3.11 python3.11-pip python3.11-devel && \
1444+
ls -la /usr/bin/python3.11 && \
1445+
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 && \
1446+
alternatives --set python3 /usr/bin/python3.11 && \
14451447
pip3 install setuptools==77.0.3 && \
14461448
pip3 install pyspark==3.5.5 cython && \
14471449
pip3 install pandas==2.2.3 pyarrow==20.0.0
@@ -1482,7 +1484,7 @@ jobs:
14821484
runs-on: ubuntu-22.04
14831485
env:
14841486
SPARK_TESTING: true
1485-
container: apache/gluten:centos-8-jdk17
1487+
container: apache/gluten:centos-9-jdk17
14861488
steps:
14871489
- uses: actions/checkout@v2
14881490
- name: Download All Artifacts

gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenCastWithAnsiOffSuite.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ class GlutenCastWithAnsiOffSuite extends CastWithAnsiOffSuite with GlutenTestsTr
9999

100100
// SystemV timezones are a legacy way of specifying timezones in Unix-like OS.
101101
// It is not supported by Velox.
102-
for (tz <- ALL_TIMEZONES.filterNot(_.getId.contains("SystemV"))) {
102+
for (
103+
tz <- ALL_TIMEZONES
104+
.filterNot(_.getId.contains("SystemV"))
105+
.filterNot(_.getId.contains("America/Coyhaique"))
106+
) {
103107
withSQLConf(
104108
SQLConf.SESSION_LOCAL_TIMEZONE.key -> tz.getId
105109
) {
@@ -184,6 +188,7 @@ class GlutenCastWithAnsiOffSuite extends CastWithAnsiOffSuite with GlutenTestsTr
184188
.filterNot(_.getId.contains("America/Ciudad_Juarez"))
185189
.filterNot(_.getId.contains("Antarctica/Vostok"))
186190
.filterNot(_.getId.contains("Pacific/Kanton"))
191+
.filterNot(_.getId.contains("America/Coyhaique"))
187192
.filterNot(_.getId.contains("Asia/Tehran"))
188193
.filterNot(_.getId.contains("Iran")),
189194
prefix = "CastSuiteBase-cast-string-to-timestamp",

gluten-ut/spark41/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenTryCastSuite.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ class GlutenTryCastSuite extends TryCastSuite with GlutenTestsTrait {
4646

4747
// SystemV timezones are a legacy way of specifying timezones in Unix-like OS.
4848
// It is not supported by Velox.
49-
for (tz <- ALL_TIMEZONES.filterNot(_.getId.contains("SystemV"))) {
49+
for (
50+
tz <- ALL_TIMEZONES
51+
.filterNot(_.getId.contains("SystemV"))
52+
.filterNot(_.getId.contains("America/Coyhaique"))
53+
) {
5054
withSQLConf(
5155
SQLConf.SESSION_LOCAL_TIMEZONE.key -> tz.getId
5256
) {
@@ -118,6 +122,7 @@ class GlutenTryCastSuite extends TryCastSuite with GlutenTestsTrait {
118122
.filterNot(_.getId.contains("SystemV"))
119123
.filterNot(_.getId.contains("Europe/Kyiv"))
120124
.filterNot(_.getId.contains("America/Ciudad_Juarez"))
125+
.filterNot(_.getId.contains("America/Coyhaique"))
121126
.filterNot(_.getId.contains("Antarctica/Vostok"))
122127
.filterNot(_.getId.contains("Pacific/Kanton"))
123128
.filterNot(_.getId.contains("Asia/Tehran"))

0 commit comments

Comments
 (0)