Skip to content

Commit

Permalink
[SPARK-50065][SQL][TESTS] Upgrade MySQL & Mariadb docker image ve…
Browse files Browse the repository at this point in the history
…rsion

### 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 <panbingkun@baidu.com>
Signed-off-by: Max Gekk <max.gekk@gmail.com>
  • Loading branch information
panbingkun authored and MaxGekk committed Oct 22, 2024
1 parent abc4986 commit 0083815
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
* }}}
Expand All @@ -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"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
* }}}
Expand Down Expand Up @@ -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"
* }}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
* }}}
*/
Expand Down Expand Up @@ -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"
* }}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
* }}}
*/
Expand Down

0 comments on commit 0083815

Please sign in to comment.