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

fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new fd7727869f [Improve][Test] Remove docker image after test finish on 
jdbc suite (#5568)
fd7727869f is described below

commit fd7727869f8d37c914927e7912b39d06387af0c7
Author: Jia Fan <fanjiaemi...@qq.com>
AuthorDate: Wed Sep 27 21:17:36 2023 +0800

    [Improve][Test] Remove docker image after test finish on jdbc suite (#5568)
---
 .../connectors/seatunnel/jdbc/AbstractJdbcIT.java      | 18 ++++++++++++++++++
 .../org/apache/seatunnel/e2e/common/TestSuiteBase.java |  5 +++++
 2 files changed, 23 insertions(+)

diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-common/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-common/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
index a38fb2217f..4f3da34175 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-common/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-common/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/AbstractJdbcIT.java
@@ -40,6 +40,7 @@ import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.lifecycle.Startables;
 
+import com.github.dockerjava.api.model.Image;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
@@ -239,6 +240,23 @@ public abstract class AbstractJdbcIT extends TestSuiteBase 
implements TestResour
     public void tearDown() throws SQLException {
         if (dbServer != null) {
             dbServer.close();
+            String images =
+                    dockerClient.listImagesCmd().exec().stream()
+                            .map(Image::getId)
+                            .collect(Collectors.joining(","));
+            log.info(
+                    "before remove image {}, list images: {}",
+                    dbServer.getDockerImageName(),
+                    images);
+            dockerClient.removeImageCmd(dbServer.getDockerImageName()).exec();
+            images =
+                    dockerClient.listImagesCmd().exec().stream()
+                            .map(Image::getId)
+                            .collect(Collectors.joining(","));
+            log.info(
+                    "after remove image {}, list images: {}",
+                    dbServer.getDockerImageName(),
+                    images);
         }
 
         if (connection != null) {
diff --git 
a/seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/TestSuiteBase.java
 
b/seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/TestSuiteBase.java
index 00f2c6502c..9e47eb856b 100644
--- 
a/seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/TestSuiteBase.java
+++ 
b/seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/TestSuiteBase.java
@@ -27,8 +27,11 @@ import org.apache.seatunnel.e2e.common.util.ContainerUtil;
 
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Network;
 
+import com.github.dockerjava.api.DockerClient;
+
 @ExtendWith({
     ContainerTestingExtension.class,
     TestLoggerExtension.class,
@@ -41,4 +44,6 @@ public abstract class TestSuiteBase {
 
     @TestContainers
     private TestContainersFactory containersFactory = 
ContainerUtil::discoverTestContainers;
+
+    protected DockerClient dockerClient = DockerClientFactory.lazyClient();
 }

Reply via email to