From af2768d027a57f45def8e806e957095541a7215c Mon Sep 17 00:00:00 2001 From: Luca Canali Date: Wed, 22 Jan 2025 10:50:56 -0800 Subject: [PATCH] [SPARK-50951][BUILD][TESTS] Update Oracle free version from 23.5 to 23.6 ### What changes were proposed in this pull request? Update of the Docker image used for building and Oracle testing to the latest version, oracle-free:23.6-slim. ### Why are the changes needed? To ensure the testing environment uses the latest Oracle Free version (23.6), providing up-to-date features and fixes. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Existing tests. ### Was this patch authored or co-authored using generative AI tooling? No Closes #49605 from LucaCanali/updateOracleFreeVersion. Authored-by: Luca Canali Signed-off-by: Dongjoon Hyun --- .github/workflows/build_branch40.yml | 2 +- connector/docker-integration-tests/README.md | 2 +- .../org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_branch40.yml b/.github/workflows/build_branch40.yml index 1d2793c96dca9..ac7155307c13d 100644 --- a/.github/workflows/build_branch40.yml +++ b/.github/workflows/build_branch40.yml @@ -40,7 +40,7 @@ jobs: "SCALA_PROFILE": "scala2.13", "PYSPARK_IMAGE_TO_TEST": "", "PYTHON_TO_TEST": "", - "ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-free:23.5-slim" + "ORACLE_DOCKER_IMAGE_NAME": "gvenzl/oracle-free:23.6-slim" } jobs: >- { diff --git a/connector/docker-integration-tests/README.md b/connector/docker-integration-tests/README.md index 50000ae196107..74a3f57ed5c0b 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.5-slim-faststart ./build/sbt -Pdocker-integration-tests "docker-integration-tests/testOnly *OracleIntegrationSuite" + ORACLE_DOCKER_IMAGE_NAME=gvenzl/oracle-free:23.6-slim ./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 87e83ff59a641..e311ec0a3b3b3 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 @@ -21,7 +21,7 @@ import org.apache.spark.internal.Logging class OracleDatabaseOnDocker extends DatabaseOnDocker with Logging { lazy override val imageName = - sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-free:23.5-slim") + sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-free:23.6-slim") val oracle_password = "Th1s1sThe0racle#Pass" override val env = Map( "ORACLE_PWD" -> oracle_password, // oracle images uses this