[INLONG-8997][Sort] Keep the logic the same of mysql with flink v1.13…

… in end to end test
apache · Oct 11, 2023 · f462e67 · f462e67
1 parent 16f891b
commit f462e67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...d-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java b/...d-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
@@ -59,10 +59,6 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        // HERE is the difference, copy to /etc/mysql/, if copy to /etc/mysql/conf.d will be wrong
-        optionallyMapResourceParameterAsVolume(
-                MY_CNF_CONFIG_OVERRIDE_PARAM_NAME, "/etc/mysql/", "mysql-default-conf");
-
         if (parameters.containsKey(SETUP_SQL_PARAM_NAME)) {
             optionallyMapResourceParameterAsVolume(
                     SETUP_SQL_PARAM_NAME, "/docker-entrypoint-initdb.d/", "N/A");
@@ -79,6 +75,7 @@ protected void configure() {
             throw new ContainerLaunchException(
                     "Empty password can be used only with the root user");
         }
+        withCommand("--default-authentication-plugin=mysql_native_password");
         setStartupAttempts(3);
     }
 
@@ -100,7 +97,8 @@ public String getJdbcUrl(String databaseName) {
                 + getDatabasePort()
                 + "/"
                 + databaseName
-                + additionalUrlParams;
+                + additionalUrlParams
+                + "?useSSL=false&allowPublicKeyRetrieval=true";
     }
 
     @Override

diff --git a/...d-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java b/...d-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/MySqlContainer.java
@@ -49,7 +49,7 @@ public MySqlContainer() {
 
     public MySqlContainer(MySqlVersion version) {
         super(DockerImageName.parse(IMAGE + ":" + version.getVersion()));
-        addFixedExposedPort(33306, 3306);
+        addExposedPort(MYSQL_PORT);
     }
 
     @Override
@@ -59,8 +59,6 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     protected void configure() {
-        // HERE is the difference, copy to /etc/mysql/, if copy to /etc/mysql/conf.d will be wrong
-
         if (parameters.containsKey(SETUP_SQL_PARAM_NAME)) {
             optionallyMapResourceParameterAsVolume(
                     SETUP_SQL_PARAM_NAME, "/docker-entrypoint-initdb.d/", "N/A");