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 aa208baf6414 [SPARK-49313][BUILD][TESTS] Upgrade `DB2` & `MySQL` &
`Postgres` & `Mariadb` docker image version
aa208baf6414 is described below
commit aa208baf641460fe7264fc2e3a898c2861f4ec99
Author: panbingkun <[email protected]>
AuthorDate: Wed Aug 28 08:06:00 2024 -0700
[SPARK-49313][BUILD][TESTS] Upgrade `DB2` & `MySQL` & `Postgres` &
`Mariadb` docker image version
### What changes were proposed in this pull request?
The pr aims to upgrade some db docker image version, include:
- `DB2` from `11.5.8.0` to `11.5.9.0` (NOTE: Its namespace (from
`ibmcom/db2` to `icr.io/db2_community/db2`) has been changed, see:
https://hub.docker.com/r/ibmcom/db2)
<img width="845" alt="image"
src="https://github.com/user-attachments/assets/893cd75e-97e5-49e0-9213-20922e543fb0";>
- `MySQL` from `9.0.0` to `9.0.1`
- `Mariadb` from `10.5.25` to `10.5.26`
- `Postgres` from `16.3-alpine` to `16.4-alpine`
### Why are the changes needed?
Tests dependencies upgrading.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass GA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #47809 from panbingkun/mysql_image_901.
Authored-by: panbingkun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../scala/org/apache/spark/sql/jdbc/DB2DatabaseOnDocker.scala | 3 ++-
.../scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala | 4 ++--
.../scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala | 4 ++--
.../org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala | 6 +++---
.../scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala | 2 +-
.../scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala | 8 ++++----
.../org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala | 6 +++---
.../org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala | 6 +++---
.../apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala | 6 +++---
.../spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala | 6 +++---
.../scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala | 4 ++--
.../scala/org/apache/spark/sql/jdbc/v2/DB2NamespaceSuite.scala | 4 ++--
.../org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala | 8 ++++----
.../scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala | 4 ++--
.../org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala | 6 +++---
.../org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala | 6 +++---
16 files changed, 42 insertions(+), 41 deletions(-)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2DatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2DatabaseOnDocker.scala
index 5cfd998b20a7..34db51ab0fd7 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2DatabaseOnDocker.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2DatabaseOnDocker.scala
@@ -18,7 +18,8 @@
package org.apache.spark.sql.jdbc
class DB2DatabaseOnDocker extends DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("DB2_DOCKER_IMAGE_NAME",
"ibmcom/db2:11.5.8.0")
+ override val imageName = sys.env.getOrElse("DB2_DOCKER_IMAGE_NAME",
+ "icr.io/db2_community/db2:11.5.9.0")
override val env = Map(
"DB2INST1_PASSWORD" -> "rootpass",
"LICENSE" -> "accept",
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
index 72b2ac8074f4..1d33acfdee01 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
@@ -29,9 +29,9 @@ import org.apache.spark.sql.types.{ByteType, ShortType,
StructType}
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., ibmcom/db2:11.5.8.0):
+ * To run this test suite for a specific version (e.g.,
icr.io/db2_community/db2:11.5.9.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=ibmcom/db2:11.5.8.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=icr.io/db2_community/db2:11.5.9.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.DB2IntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
index 4899de2b2a14..e149b2d866dd 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
@@ -30,9 +30,9 @@ import
org.apache.spark.sql.execution.datasources.jdbc.connection.{DB2Connection
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., ibmcom/db2:11.5.8.0):
+ * To run this test suite for a specific version (e.g.,
icr.io/db2_community/db2:11.5.9.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=ibmcom/db2:11.5.8.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=icr.io/db2_community/db2:11.5.9.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly *DB2KrbIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
index efb2fa09f6a3..d7b270c97d3c 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
@@ -25,9 +25,9 @@ import
org.apache.spark.sql.execution.datasources.jdbc.connection.SecureConnecti
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mariadb:10.5.25):
+ * To run this test suite for a specific version (e.g., mariadb:10.5.26):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
MARIADB_DOCKER_IMAGE_NAME=mariadb:10.5.25
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
MARIADB_DOCKER_IMAGE_NAME=mariadb:10.5.26
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.MariaDBKrbIntegrationSuite"
* }}}
@@ -38,7 +38,7 @@ class MariaDBKrbIntegrationSuite extends
DockerKrbJDBCIntegrationSuite {
override protected val keytabFileName = "mariadb.keytab"
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MARIADB_DOCKER_IMAGE_NAME",
"mariadb:10.5.25")
+ override val imageName = sys.env.getOrElse("MARIADB_DOCKER_IMAGE_NAME",
"mariadb:10.5.26")
override val env = Map(
"MYSQL_ROOT_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
index 97f076eccf94..dc23dfa87401 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
@@ -18,7 +18,7 @@
package org.apache.spark.sql.jdbc
class MySQLDatabaseOnDocker extends DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME",
"mysql:9.0.0")
+ override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME",
"mysql:9.0.1")
override val env = Map(
"MYSQL_ROOT_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
index c1ddc37c97c7..23e3e1457c97 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
@@ -31,9 +31,9 @@ import org.apache.spark.sql.types.ShortType
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.0):
+ * To run this test suite for a specific version (e.g., mysql:9.0.1):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.MySQLIntegrationSuite"
* }}}
@@ -364,9 +364,9 @@ class MySQLIntegrationSuite extends
DockerJDBCIntegrationSuite {
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.0):
+ * To run this test suite for a specific version (e.g., mysql:9.0.1):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
*MySQLOverMariaConnectorIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
index 3eca9c5cb061..3076b599ef4e 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
@@ -32,9 +32,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:16.3-alpine):
+ * To run this test suite for a specific version (e.g., postgres:16.4-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.PostgresIntegrationSuite"
* }}}
@@ -42,7 +42,7 @@ import org.apache.spark.tags.DockerTest
@DockerTest
class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
index af1cd464ad5f..5acb6423bbd9 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
@@ -25,9 +25,9 @@ import
org.apache.spark.sql.execution.datasources.jdbc.connection.SecureConnecti
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:16.3-alpine):
+ * To run this test suite for a specific version (e.g., postgres:16.4-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly *PostgresKrbIntegrationSuite"
* }}}
@@ -38,7 +38,7 @@ class PostgresKrbIntegrationSuite extends
DockerKrbJDBCIntegrationSuite {
override protected val keytabFileName = "postgres.keytab"
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
index b6291639a24e..8d367f476403 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.tags.DockerTest
/**
* This suite is used to generate subqueries, and test Spark against Postgres.
- * To run this test suite for a specific version (e.g., postgres:16.3-alpine):
+ * To run this test suite for a specific version (e.g., postgres:16.4-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.GeneratedSubquerySuite"
* }}}
@@ -39,7 +39,7 @@ import org.apache.spark.tags.DockerTest
class GeneratedSubquerySuite extends DockerJDBCIntegrationSuite with
QueryGeneratorHelper {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
index de28e16b325c..f3a08541365c 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
@@ -30,9 +30,9 @@ import org.apache.spark.tags.DockerTest
* confidence, and you won't have to manually verify the golden files
generated with your test.
* 2. Add this line to your .sql file: --ONLY_IF spark
*
- * Note: To run this test suite for a specific version (e.g.,
postgres:16.3-alpine):
+ * Note: To run this test suite for a specific version (e.g.,
postgres:16.4-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests
* "testOnly org.apache.spark.sql.jdbc.PostgreSQLQueryTestSuite"
* }}}
@@ -45,7 +45,7 @@ class PostgreSQLQueryTestSuite extends
CrossDbmsQueryTestSuite {
protected val customInputFilePath: String = new File(inputFilePath,
"subquery").getAbsolutePath
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala
index 57129e9d846f..b337eb2fc9b3 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2IntegrationSuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., ibmcom/db2:11.5.8.0):
+ * To run this test suite for a specific version (e.g.,
icr.io/db2_community/db2:11.5.9.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=ibmcom/db2:11.5.8.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=icr.io/db2_community/db2:11.5.9.0
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2.DB2IntegrationSuite"
* }}}
*/
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2NamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2NamespaceSuite.scala
index 528b26e61e76..385039fb6bd5 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2NamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DB2NamespaceSuite.scala
@@ -26,9 +26,9 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., ibmcom/db2:11.5.8.0):
+ * To run this test suite for a specific version (e.g.,
icr.io/db2_community/db2:11.5.9.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=ibmcom/db2:11.5.8.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
DB2_DOCKER_IMAGE_NAME=icr.io/db2_community/db2:11.5.9.0
* ./build/sbt -Pdocker-integration-tests "testOnly *v2.DB2NamespaceSuite"
* }}}
*/
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
index c48505ff153f..81aacf2c14d7 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
@@ -27,9 +27,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.0):
+ * To run this test suite for a specific version (e.g., mysql:9.0.1):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2*MySQLIntegrationSuite"
* }}}
*/
@@ -160,9 +160,9 @@ class MySQLIntegrationSuite extends
DockerJDBCIntegrationV2Suite with V2JDBCTest
}
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.0):
+ * To run this test suite for a specific version (e.g., mysql:9.0.1):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
*MySQLOverMariaConnectorIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
index b49f6901034b..42d82233b421 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.0):
+ * To run this test suite for a specific version (e.g., mysql:9.0.1):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2*MySQLNamespaceSuite"
* }}}
*/
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
index 7c439d449d86..e22136a09a56 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:16.3-alpine)
+ * To run this test suite for a specific version (e.g., postgres:16.4-alpine)
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2.PostgresIntegrationSuite"
* }}}
*/
@@ -38,7 +38,7 @@ import org.apache.spark.tags.DockerTest
class PostgresIntegrationSuite extends DockerJDBCIntegrationV2Suite with
V2JDBCTest {
override val catalogName: String = "postgresql"
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
index 8a2d0ded8438..665746f1d577 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
@@ -26,16 +26,16 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:16.3-alpine):
+ * To run this test suite for a specific version (e.g., postgres:16.4-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.3-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2.PostgresNamespaceSuite"
* }}}
*/
@DockerTest
class PostgresNamespaceSuite extends DockerJDBCIntegrationSuite with
V2JDBCNamespaceTest {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.3-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.4-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
