This is an automated email from the ASF dual-hosted git repository.
yangjie01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 8cdcfd262f9 [SPARK-45665][INFRA] Uses different
`ORACLE_DOCKER_IMAGE_NAME` in the scheduled builds in other branches
8cdcfd262f9 is described below
commit 8cdcfd262f9fd46fb9a8e1ceb0bccefe452582bd
Author: yangjie01 <[email protected]>
AuthorDate: Thu Oct 26 11:22:41 2023 +0800
[SPARK-45665][INFRA] Uses different `ORACLE_DOCKER_IMAGE_NAME` in the
scheduled builds in other branches
### What changes were proposed in this pull request?
https://github.com/apache/spark/pull/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 <[email protected]>
Co-authored-by: YangJie <[email protected]>
Signed-off-by: yangjie01 <[email protected]>
---
.github/workflows/build_and_test.yml | 1 +
.github/workflows/build_branch33.yml | 3 ++-
.github/workflows/build_branch34.yml | 3 ++-
.github/workflows/build_branch35.yml | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 13e751bcaa7..5825185f344 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -982,6 +982,7 @@ jobs:
distribution: zulu
java-version: ${{ inputs.java }}
- name: Run tests
+ env: ${{ fromJSON(inputs.envs) }}
run: |
./dev/run-tests --parallelism 1 --modules docker-integration-tests
--included-tags org.apache.spark.tags.DockerTest
- name: Upload test results to report
diff --git a/.github/workflows/build_branch33.yml
b/.github/workflows/build_branch33.yml
index 63a950447f5..fc6ce7028fc 100644
--- a/.github/workflows/build_branch33.yml
+++ b/.github/workflows/build_branch33.yml
@@ -37,7 +37,8 @@ jobs:
envs: >-
{
"SCALA_PROFILE": "scala2.13",
- "PYTHON_TO_TEST": ""
+ "PYTHON_TO_TEST": "",
+ "ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
}
jobs: >-
{
diff --git a/.github/workflows/build_branch34.yml
b/.github/workflows/build_branch34.yml
index 740b68b69e3..deb43d82c97 100644
--- a/.github/workflows/build_branch34.yml
+++ b/.github/workflows/build_branch34.yml
@@ -37,7 +37,8 @@ jobs:
envs: >-
{
"SCALA_PROFILE": "scala2.13",
- "PYTHON_TO_TEST": ""
+ "PYTHON_TO_TEST": "",
+ "ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
}
jobs: >-
{
diff --git a/.github/workflows/build_branch35.yml
b/.github/workflows/build_branch35.yml
index 15ee66a9ce4..9e6fe13c020 100644
--- a/.github/workflows/build_branch35.yml
+++ b/.github/workflows/build_branch35.yml
@@ -37,7 +37,8 @@ jobs:
envs: >-
{
"SCALA_PROFILE": "scala2.13",
- "PYTHON_TO_TEST": ""
+ "PYTHON_TO_TEST": "",
+ "ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-xe:21.3.0"
}
jobs: >-
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
