This is an automated email from the ASF dual-hosted git repository.
yumwang 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 7b3f544 [SPARK-38757][BUILD][TEST] Update oracle-xe version from
18.4.0 to 21.3.0
7b3f544 is described below
commit 7b3f5447dc4e20da125605152a2c905f14c9709c
Author: Luca Canali <luca.can...@cern.ch>
AuthorDate: Sat Apr 2 21:47:18 2022 +0800
[SPARK-38757][BUILD][TEST] Update oracle-xe version from 18.4.0 to 21.3.0
### What changes are proposed in this pull request?
This proposes to update the Docker image used for integration tests and
builds from Oracle XE version 18.4.0 to Oracle XE version 21.3.0.
### Why are the changes needed?
Currently Oracle XE version 18.4.0 is being used. Oracle 18c support has
ended in 2021. Oracle 21c is the latest release of the Oracle RDBMS.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Existing test infrastructure.
Closes #36036 from LucaCanali/updateOraclexeImage.
Authored-by: Luca Canali <luca.can...@cern.ch>
Signed-off-by: Yuming Wang <yumw...@ebay.com>
---
.github/workflows/build_and_test.yml | 2 +-
.../scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala | 8 ++++----
.../org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala | 8 ++++----
.../scala/org/apache/spark/sql/jdbc/v2/OracleNamespaceSuite.scala | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 855d22dd..f91ae32 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -779,7 +779,7 @@ jobs:
HIVE_PROFILE: hive2.3
GITHUB_PREV_SHA: ${{ github.event.before }}
SPARK_LOCAL_IP: localhost
- ORACLE_DOCKER_IMAGE_NAME: gvenzl/oracle-xe:18.4.0
+ ORACLE_DOCKER_IMAGE_NAME: gvenzl/oracle-xe:21.3.0
SKIP_MIMA: true
steps:
- name: Checkout Spark repository
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 8972c53..a9c57e5 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -53,10 +53,10 @@ import org.apache.spark.tags.DockerTest
* A sequence of commands to build the Oracle XE database container image:
* $ git clone https://github.com/oracle/docker-images.git
* $ cd docker-images/OracleDatabase/SingleInstance/dockerfiles
- * $ ./buildContainerImage.sh -v 18.4.0 -x
- * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:18.4.0-xe
+ * $ ./buildContainerImage.sh -v 21.3.0 -x
+ * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:21.3.0-xe
*
- * This procedure has been validated with Oracle 18.4.0 Express Edition.
+ * This procedure has been validated with Oracle 18.4.0 and 21.3.0 Express
Edition.
*/
@DockerTest
class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with
SharedSparkSession {
@@ -64,7 +64,7 @@ class OracleIntegrationSuite extends
DockerJDBCIntegrationSuite with SharedSpark
override val db = new DatabaseOnDocker {
lazy override val imageName =
- sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:18.4.0")
+ sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:21.3.0")
val oracle_password = "Th1s1sThe0racle#Pass"
override val env = Map(
"ORACLE_PWD" -> oracle_password, // oracle images uses this
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala
index 2669924..8bc79a2 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala
@@ -49,10 +49,10 @@ import org.apache.spark.tags.DockerTest
* A sequence of commands to build the Oracle XE database container image:
* $ git clone https://github.com/oracle/docker-images.git
* $ cd docker-images/OracleDatabase/SingleInstance/dockerfiles
- * $ ./buildContainerImage.sh -v 18.4.0 -x
- * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:18.4.0-xe
+ * $ ./buildContainerImage.sh -v 21.3.0 -x
+ * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:21.3.0-xe
*
- * This procedure has been validated with Oracle 18.4.0 Express Edition.
+ * This procedure has been validated with Oracle 18.4.0 and 21.3.0 Express
Edition.
*/
@DockerTest
class OracleIntegrationSuite extends DockerJDBCIntegrationV2Suite with
V2JDBCTest {
@@ -60,7 +60,7 @@ class OracleIntegrationSuite extends
DockerJDBCIntegrationV2Suite with V2JDBCTes
override val namespaceOpt: Option[String] = Some("SYSTEM")
override val db = new DatabaseOnDocker {
lazy override val imageName =
- sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:18.4.0")
+ sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:21.3.0")
val oracle_password = "Th1s1sThe0racle#Pass"
override val env = Map(
"ORACLE_PWD" -> oracle_password, // oracle images uses this
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleNamespaceSuite.scala
index 31f26d2..b3e9d19 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleNamespaceSuite.scala
@@ -45,16 +45,16 @@ import org.apache.spark.tags.DockerTest
* A sequence of commands to build the Oracle XE database container image:
* $ git clone https://github.com/oracle/docker-images.git
* $ cd docker-images/OracleDatabase/SingleInstance/dockerfiles
- * $ ./buildContainerImage.sh -v 18.4.0 -x
- * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:18.4.0-xe
+ * $ ./buildContainerImage.sh -v 21.3.0 -x
+ * $ export ORACLE_DOCKER_IMAGE_NAME=oracle/database:21.3.0-xe
*
- * This procedure has been validated with Oracle 18.4.0 Express Edition.
+ * This procedure has been validated with Oracle 18.4.0 and 21.3.0 Express
Edition.
*/
@DockerTest
class OracleNamespaceSuite extends DockerJDBCIntegrationSuite with
V2JDBCNamespaceTest {
override val db = new DatabaseOnDocker {
lazy override val imageName =
- sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:18.4.0")
+ sys.env.getOrElse("ORACLE_DOCKER_IMAGE_NAME", "gvenzl/oracle-xe:21.3.0")
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
