Skip to content

Commit 8cdcfd2

Browse files
committed
[SPARK-45665][INFRA] Uses different ORACLE_DOCKER_IMAGE_NAME in the scheduled builds in other branches
### What changes were proposed in this pull request? #43123 upgraded the version of Oracle used for testing. As the daily test will reuse `build_and_test.yml`, the branch-3.x will also use the new version. However, due to the lack of synchronized code changes, the `OracleIntegrationSuite` in the `Docker integration tests` cannot pass the test during the daily test of branch-3.x: - branch-3.3: https://github.com/apache/spark/actions/runs/6609791712/job/17950549755 - branch-3.4: https://github.com/apache/spark/actions/runs/6611049884/job/17954225189 - branch-3.5: https://github.com/apache/spark/actions/runs/6612344747/job/17958021656 So this PR adds the ORACLE_DOCKER_IMAGE_NAME environment variable to the daily test yml file for branch-3.x and uses the previous version of the Oracle Docker image that can pass the test successfully. ### Why are the changes needed? Restore the daily test for branch-3.x. ### Does this PR introduce _any_ user-facing change? No,dev-only ### How was this patch tested? Monitor the daily test results. ### Was this patch authored or co-authored using generative AI tooling? No Closes #43496 from LuciferYang/oracl-docker-image-name. Lead-authored-by: yangjie01 <yangjie01@baidu.com> Co-authored-by: YangJie <yangjie01@baidu.com> Signed-off-by: yangjie01 <yangjie01@baidu.com>
1 parent 25c74d0 commit 8cdcfd2

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,7 @@ jobs:
982982
distribution: zulu
983983
java-version: ${{ inputs.java }}
984984
- name: Run tests
985+
env: ${{ fromJSON(inputs.envs) }}
985986
run: |
986987
./dev/run-tests --parallelism 1 --modules docker-integration-tests --included-tags org.apache.spark.tags.DockerTest
987988
- name: Upload test results to report

.github/workflows/build_branch33.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
envs: >-
3838
{
3939
"SCALA_PROFILE": "scala2.13",
40-
"PYTHON_TO_TEST": ""
40+
"PYTHON_TO_TEST": "",
41+
"ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
4142
}
4243
jobs: >-
4344
{

.github/workflows/build_branch34.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
envs: >-
3838
{
3939
"SCALA_PROFILE": "scala2.13",
40-
"PYTHON_TO_TEST": ""
40+
"PYTHON_TO_TEST": "",
41+
"ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
4142
}
4243
jobs: >-
4344
{

.github/workflows/build_branch35.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
envs: >-
3838
{
3939
"SCALA_PROFILE": "scala2.13",
40-
"PYTHON_TO_TEST": ""
40+
"PYTHON_TO_TEST": "",
41+
"ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
4142
}
4243
jobs: >-
4344
{

0 commit comments

Comments
 (0)