This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch testcontainer
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/testcontainer by this push:
new 588675f temporary submit
588675f is described below
commit 588675f5c9d3a6c913127c8cdb913ed04fdb20db
Author: xiangdong huang <[email protected]>
AuthorDate: Fri Apr 9 00:03:26 2021 +0800
temporary submit
---
pom.xml | 4 ----
testcontainer/pom.xml | 13 +++++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 577254d..383db7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -950,7 +950,6 @@
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
</plugin>
-
<!-- If docker exist, we add src/test/container as the test source
folder.
Otherwise, we just add src/test/java as the test source folder, which
does not take any effect.-->
<plugin>
@@ -1028,7 +1027,6 @@
<thrift.exec-cmd.args>+x
${project.build.directory}/tools/${thrift.executable}</thrift.exec-cmd.args>
</properties>
</profile>
-
<!-- for TestContainer. As it requires docker, we have to detect
whether docker exists.-->
<profile>
<!-- Mac and Unix-->
@@ -1053,7 +1051,6 @@
<docker.test.folder>container</docker.test.folder>
</properties>
</profile>
-
<!-- Some APIs were removed in Java 11, so we need to add replacements
-->
<profile>
<id>java-11-and-above</id>
@@ -1426,6 +1423,5 @@
<enforcer.skip>false</enforcer.skip>
</properties>
</profile>
-
</profiles>
</project>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index 8bd42f4..acc332c 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -12,6 +12,7 @@
<docker.test.skip>false</docker.test.skip>
<docker.build.executable>docker</docker.build.executable>
<docker.build.argument>build -t apache/iotdb:maven-development -f
${basedir}/../docker/src/main/Dockerfile ${basedir}/../.</docker.build.argument>
+ <docker.clean.argument>image rm
apache/iotdb:maven-development</docker.clean.argument>
</properties>
<!-- If docker exist, we add src/test/container as the test source folder.
Otherwise, we just add src/test/java as the test source folder,
which does not take any effect.-->
@@ -41,6 +42,18 @@
<commandlineArgs>${docker.build.argument}</commandlineArgs>
</configuration>
</execution>
+ <execution>
+ <id>clean-docker-image</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <skip>${docker.test.skip}</skip>
+
<executable>${docker.build.executable}</executable>
+
<commandlineArgs>${docker.clean.argument}</commandlineArgs>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!-- <plugin>-->
