You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2024/10/22 18:30:07 UTC
(spark) branch master updated: [SPARK-50065][SQL][TESTS] Upgrade `MySQL` & `Mariadb` docker image version
This is an automated email from the ASF dual-hosted git repository.
maxgekk 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 008381518fa3 [SPARK-50065][SQL][TESTS] Upgrade `MySQL` & `Mariadb` docker image version
008381518fa3 is described below
commit 008381518fa3c38b95e5d573b4001d51681768f1
Author: panbingkun <pa...@baidu.com>
AuthorDate: Tue Oct 22 20:29:53 2024 +0200
[SPARK-50065][SQL][TESTS] Upgrade `MySQL` & `Mariadb` docker image version
### What changes were proposed in this pull request?
The pr aims to upgrade `MySQL` & `Mariadb` docker image version, detail as follows:
- `MYSQL` from `9.0.1` to `9.1.0`
- `Mariadb` from `10.5.26` to `10.6.19`
### 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 #48588 from panbingkun/SPARK-50065.
Authored-by: panbingkun <pa...@baidu.com>
Signed-off-by: Max Gekk <ma...@gmail.com>
---
.../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/v2/MySQLIntegrationSuite.scala | 8 ++++----
.../scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
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 d7b270c97d3c..2ee88863e93f 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.26):
+ * To run this test suite for a specific version (e.g., mariadb:10.6.19):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MARIADB_DOCKER_IMAGE_NAME=mariadb:10.5.26
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MARIADB_DOCKER_IMAGE_NAME=mariadb:10.6.19
* ./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.26")
+ override val imageName = sys.env.getOrElse("MARIADB_DOCKER_IMAGE_NAME", "mariadb:10.6.19")
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 dc23dfa87401..d5b61d479af1 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.1")
+ override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME", "mysql:9.1.0")
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 23e3e1457c97..deeb52267a14 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.1):
+ * To run this test suite for a specific version (e.g., mysql:9.1.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
* ./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.1):
+ * To run this test suite for a specific version (e.g., mysql:9.1.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
* ./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/MySQLIntegrationSuite.scala b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
index a89573925437..9c07ce939fe3 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.1):
+ * To run this test suite for a specific version (e.g., mysql:9.1.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLIntegrationSuite"
* }}}
*/
@@ -244,9 +244,9 @@ class MySQLIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCTest
}
/**
- * To run this test suite for a specific version (e.g., mysql:9.0.1):
+ * To run this test suite for a specific version (e.g., mysql:9.1.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
* ./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 5e40f0bbc455..5db1b9f863ad 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.1):
+ * To run this test suite for a specific version (e.g., mysql:9.1.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLNamespaceSuite"
* }}}
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org