This is an automated email from the ASF dual-hosted git repository.
dongjoon 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 05b22ebb3060 [SPARK-48141][TEST] Update the Oracle docker image
version used for test and integration to use Oracle Database 23ai Free
05b22ebb3060 is described below
commit 05b22ebb30606a76c50e649a6efa825f03ca97ff
Author: Luca Canali <luca.can...@cern.ch>
AuthorDate: Mon May 6 20:44:51 2024 -0700
[SPARK-48141][TEST] Update the Oracle docker image version used for test
and integration to use Oracle Database 23ai Free
### What changes were proposed in this pull request?
This proposes to update the Docker image used for integration tests and
builds to Oracle Database 23ai Free, version 23.4 (previously we used Oracle
Database 23c Free, version 23.3)
### Why are the changes needed?
This is to keep the testing infrastructure up-to-date with the latest
Oracle Database Free version.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Existing test infrastructure.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #46399 from LucaCanali/updateOracleImage.
Lead-authored-by: Luca Canali <luca.can...@cern.ch>
Co-authored-by: Dongjoon Hyun <dongj...@apache.org>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.github/workflows/build_and_test.yml | 1 -
connector/docker-integration-tests/README.md | 2 +-
.../test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index b34456fc3e42..286f8e1193d9 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -928,7 +928,6 @@ jobs:
HIVE_PROFILE: hive2.3
GITHUB_PREV_SHA: ${{ github.event.before }}
SPARK_LOCAL_IP: localhost
- ORACLE_DOCKER_IMAGE_NAME: gvenzl/oracle-free:23.3
SKIP_UNIDOC: true
SKIP_MIMA: true
SKIP_PACKAGING: true
diff --git a/connector/docker-integration-tests/README.md
b/connector/docker-integration-tests/README.md
index 0192947bdbf9..03d3fe706a60 100644
--- a/connector/docker-integration-tests/README.md
+++ b/connector/docker-integration-tests/README.md
@@ -45,7 +45,7 @@ the container bootstrapping. To run an individual Docker
integration test, use t
Besides the default Docker images, the integration tests can be run with
custom Docker images. For example,
- ORACLE_DOCKER_IMAGE_NAME=gvenzl/oracle-free:23.3-slim-faststart
./build/sbt -Pdocker-integration-tests "docker-integration-tests/testOnly
*OracleIntegrationSuite"
+ ORACLE_DOCKER_IMAGE_NAME=gvenzl/oracle-free:23.4-slim-faststart
./build/sbt -Pdocker-integration-tests "docker-integration-tests/testOnly
*OracleIntegrationSuite"
The following environment variables can be used to specify the custom Docker
images for different databases:
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala
index bfbcf5b533d7..88bb23f9c653 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala
@@ -26,7 +26,7 @@ import org.apache.spark.util.Utils
class OracleDatabaseOnDocker extends DatabaseOnDocker with Logging {
lazy override val imageName =
- sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME",
"gvenzl/oracle-free:23.3-slim")
+ sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME",
"gvenzl/oracle-free:23.4-slim")
val oracle_password = "Th1s1sThe0racle#Pass"
override val env = Map(
"ORACLE_PWD" -> oracle_password, // oracle images uses this
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
