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
commit fa65b2aff25d99fbc17a5371e1735bcbdb3d6f1a Author: xiangdong huang <[email protected]> AuthorDate: Sun Apr 18 00:48:09 2021 +0800 remove duplicated operations in integration-test phase --- cli/pom.xml | 1 - cluster/pom.xml | 1 - cross-tests/pom.xml | 1 - grafana/pom.xml | 1 - hadoop/pom.xml | 1 - jdbc/pom.xml | 1 - pom.xml | 2 - server/pom.xml | 1 - service-rpc/pom.xml | 1 - session/pom.xml | 1 - testcontainer/pom.xml | 179 ++++++++++++++++++++++++++++---------------------- tsfile/pom.xml | 1 - 12 files changed, 100 insertions(+), 91 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 1fb8f29..b6b3681 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -96,7 +96,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/cluster/pom.xml b/cluster/pom.xml index d211396..ca879ca 100644 --- a/cluster/pom.xml +++ b/cluster/pom.xml @@ -202,7 +202,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml index 0d8cd64..e3a5eb6 100644 --- a/cross-tests/pom.xml +++ b/cross-tests/pom.xml @@ -73,7 +73,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/grafana/pom.xml b/grafana/pom.xml index a24ba06..db78562 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -197,7 +197,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 776e377..75951d3 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -116,7 +116,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/jdbc/pom.xml b/jdbc/pom.xml index dd17752..1896f5e 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -159,7 +159,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/pom.xml b/pom.xml index eb27a42..56c659f 100644 --- a/pom.xml +++ b/pom.xml @@ -904,7 +904,6 @@ <excludes> <!-- Exclude integration tests within (unit) test phase. --> <exclude>src/test/**/*IT.java</exclude> - <exclude>src/test/**/*E2E.java</exclude> </excludes> </configuration> </execution> @@ -918,7 +917,6 @@ <includes> <!-- Include integration tests within integration-test phase. --> <include>src/test/**/*IT.java</include> - <include>src/test/**/*E2E.java</include> </includes> <excludes> <!-- Exclude unit tests within (unit) test phase. --> diff --git a/server/pom.xml b/server/pom.xml index dee952f..05f5b64 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -221,7 +221,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index f517fdd..34df869 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -114,7 +114,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/session/pom.xml b/session/pom.xml index e1330c5..6751dd1 100644 --- a/session/pom.xml +++ b/session/pom.xml @@ -54,7 +54,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions> diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml index f8bb9f6..8a17d4d 100644 --- a/testcontainer/pom.xml +++ b/testcontainer/pom.xml @@ -36,83 +36,104 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <!-- before integration test, we build the docker image --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> - <executions> - <execution> - <id>build-docker-image</id> - <phase>pre-integration-test</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <skip>${docker.test.skip}</skip> - <executable>${docker.build.executable}</executable> - <commandlineArgs>${docker.build.single.argument}</commandlineArgs> - </configuration> - </execution> - <execution> - <id>build-cluster-docker-image</id> - <phase>pre-integration-test</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <skip>${docker.test.skip}</skip> - <executable>${docker.build.executable}</executable> - <commandlineArgs>${docker.build.cluster.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.single.argument}</commandlineArgs> - </configuration> - </execution> - <execution> - <id>clean-cluster-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.cluster.argument}</commandlineArgs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>add-test-container-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src/test/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>testcontainer</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <!-- before integration test, we build the docker image --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.6.0</version> + <executions> + <execution> + <id>build-docker-image</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <skip>${docker.test.skip}</skip> + <executable>${docker.build.executable}</executable> + <commandlineArgs>${docker.build.single.argument}</commandlineArgs> + </configuration> + </execution> + <execution> + <id>build-cluster-docker-image</id> + <phase>pre-integration-test</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <skip>${docker.test.skip}</skip> + <executable>${docker.build.executable}</executable> + <commandlineArgs>${docker.build.cluster.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.single.argument}</commandlineArgs> + </configuration> + </execution> + <execution> + <id>clean-cluster-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.cluster.argument}</commandlineArgs> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>add-test-container-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/src/test/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <id>run-integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/tsfile/pom.xml b/tsfile/pom.xml index b5e1370..41bb74e 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -115,7 +115,6 @@ <phase>integration-test</phase> <goals> <goal>integration-test</goal> - <goal>verify</goal> </goals> </execution> </executions>
