[Feature][Jdbc] Fix the ci for jdbc-iris

apache · May 7, 2024 · 3295887 · 3295887
1 parent d6861ef
commit 3295887
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/...c-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java b/...c-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java
@@ -41,8 +41,6 @@
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.DockerLoggerFactory;
 import org.testcontainers.utility.MountableFile;
 
 import com.google.common.collect.Lists;
@@ -69,8 +67,8 @@
 
 @DisabledOnContainer(
         value = {},
-        type = {EngineType.FLINK},
-        disabledReason = "Currently flink is prone to time out, temporarily disable")
+        type = {EngineType.FLINK, EngineType.SPARK},
+        disabledReason = "Currently flink and spark is prone to time out, temporarily disable")
 @Slf4j
 public class JdbcIrisIT extends AbstractJdbcIT {
     private static final String IRIS_IMAGE = "intersystems/iris-community:2023.1";
@@ -545,19 +543,16 @@ Pair<String[], List<SeaTunnelRow>> initTestData() {
 
     @Override
     GenericContainer<?> initContainer() {
-        DockerImageName imageName = DockerImageName.parse(IRIS_IMAGE);
-
         GenericContainer<?> container =
-                new GenericContainer(imageName)
+                new GenericContainer(IRIS_IMAGE)
                         .withCopyFileToContainer(
                                 MountableFile.forClasspathResource("password/password.txt"),
                                 "/tmp/password.txt")
                         .withCommand("--password-file /tmp/password.txt")
                         .withNetwork(NETWORK)
                         .withNetworkAliases(IRIS_NETWORK_ALIASES)
                         .withExposedPorts(IRIS_PORT)
-                        .withLogConsumer(
-                                new Slf4jLogConsumer(DockerLoggerFactory.getLogger(IRIS_IMAGE)));
+                        .withLogConsumer(new Slf4jLogConsumer(log));
 
         container.setPortBindings(Lists.newArrayList(String.format("%s:%s", IRIS_PORT, IRIS_PORT)));