[shardingsphere] branch master updated: Refactor : unique the mysql image in E2E test (#26910) (#26917)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new a2f5d1f9df4 Refactor : unique the mysql image in E2E test (#26910) 
(#26917)
a2f5d1f9df4 is described below

commit a2f5d1f9df493f2059a266e86e843ca87663ae0e
Author: 孙念君 Nianjun Sun <sunnian...@apache.org>
AuthorDate: Wed Jul 12 16:25:49 2023 +0800

    Refactor : unique the mysql image in E2E test (#26910) (#26917)
---
 .github/workflows/e2e-showprocesslist.yml                               | 2 +-
 .github/workflows/e2e-transaction.yml                                   | 2 +-
 .../test/e2e/env/container/atomic/storage/impl/MySQLContainer.java      | 2 +-
 .../test/e2e/transaction/engine/base/TransactionBaseE2EIT.java          | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e-showprocesslist.yml 
b/.github/workflows/e2e-showprocesslist.yml
index 7934efe6e9f..a91270ce446 100644
--- a/.github/workflows/e2e-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -61,7 +61,7 @@ jobs:
     name: E2E - ShowProcesslist
     runs-on: ubuntu-latest
     env:
-      mysql_version: 5.7
+      mysql_version: mysql:5.7
     timeout-minutes: 10
     strategy:
       matrix:
diff --git a/.github/workflows/e2e-transaction.yml 
b/.github/workflows/e2e-transaction.yml
index a80b97a643a..426e9d4ddab 100644
--- a/.github/workflows/e2e-transaction.yml
+++ b/.github/workflows/e2e-transaction.yml
@@ -67,7 +67,7 @@ jobs:
     env:
       postgresql_version: postgres:12-alpine
       opengauss_version: enmotech/opengauss:2.1.0
-      mysql_version: 5.7
+      mysql_version: mysql:5.7
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
index c2df69a4d54..a655c225b1e 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
@@ -37,7 +37,7 @@ public final class MySQLContainer extends 
DockerStorageContainer {
     private final StorageContainerConfiguration storageContainerConfig;
     
     public MySQLContainer(final String containerImage, final String scenario, 
final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), 
Strings.isNullOrEmpty(containerImage) ? "mysql/mysql-server:5.7.39" : 
containerImage, scenario);
+        super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), 
Strings.isNullOrEmpty(containerImage) ? "mysql:5.7" : containerImage, scenario);
         this.storageContainerConfig = storageContainerConfig;
     }
     
diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index d100d862537..9b1f55c579f 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -452,7 +452,6 @@ public abstract class TransactionBaseE2EIT {
         private String getStorageContainerImageName(final String databaseType, 
final String databaseVersion) {
             switch (databaseType) {
                 case TransactionTestConstants.MYSQL:
-                    return "mysql/mysql-server:" + databaseVersion;
                 case TransactionTestConstants.POSTGRESQL:
                 case TransactionTestConstants.OPENGAUSS:
                     return databaseVersion;