Skip to content

Commit

Permalink
[SPARK-48874][SQL][DOCKER][BUILD][TESTS] Upgrade MySQL docker image…
Browse files Browse the repository at this point in the history
… version to `9.0.0`

### What changes were proposed in this pull request?
The pr aims to upgrade `MySQ`L docker image version from `8.4.0` to `9.0.0`.

### Why are the changes needed?
After https://issues.apache.org/jira/browse/SPARK-48795, we have upgraded the `mysql jdbc driver` version to `9.0.0` for testing, so I propose that the corresponding `mysql server docker image` should also be upgraded to `9.0.0`

### 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 apache#47311 from panbingkun/mysql_image_9.

Authored-by: panbingkun <panbingkun@baidu.com>
Signed-off-by: Kent Yao <yao@apache.org>
  • Loading branch information
panbingkun authored and attilapiros committed Oct 4, 2024
1 parent 6d8a9b2 commit dbd507e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
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:8.4.0")
override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME", "mysql:9.0.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:8.3.0):
* To run this test suite for a specific version (e.g., mysql:9.0.0):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:8.3.0
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly org.apache.spark.sql.jdbc.MySQLIntegrationSuite"
* }}}
Expand Down Expand Up @@ -355,9 +355,9 @@ class MySQLIntegrationSuite extends DockerJDBCIntegrationSuite {


/**
* To run this test suite for a specific version (e.g., mysql:8.3.0):
* To run this test suite for a specific version (e.g., mysql:9.0.0):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:8.3.0
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.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:8.3.0):
* To run this test suite for a specific version (e.g., mysql:9.0.0):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:8.3.0
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLIntegrationSuite"
* }}}
*/
Expand Down Expand Up @@ -160,9 +160,9 @@ class MySQLIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCTest
}

/**
* To run this test suite for a specific version (e.g., mysql:8.3.0):
* To run this test suite for a specific version (e.g., mysql:9.0.0):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:8.3.0
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.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:8.3.0):
* To run this test suite for a specific version (e.g., mysql:9.0.0):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:8.3.0
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.0.0
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLNamespaceSuite"
* }}}
*/
Expand Down

0 comments on commit dbd507e

Please sign in to comment.