This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.11.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 20c086c4fa96682e6757299dc9e9c5e4a018a768 Author: Kevin Doran <[email protected]> AuthorDate: Mon Feb 24 13:51:17 2020 -0500 NIFI-7191 Conditionally disable docker integration tests Honor Maven properties skipTests and maven.test.skip for the shell script integration tests that verifiy docker images. --- nifi-docker/dockerhub/pom.xml | 45 +++++++++++++++++++++++++ nifi-docker/dockermaven/pom.xml | 45 +++++++++++++++++++++++++ nifi-toolkit/nifi-toolkit-assembly/pom.xml | 53 ++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml index c8e98fe..f7db33f 100644 --- a/nifi-docker/dockerhub/pom.xml +++ b/nifi-docker/dockerhub/pom.xml @@ -71,6 +71,51 @@ </plugins> </build> </profile> + <profile> + <id>docker-skip-tests</id> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>docker-test-skip-test</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> \ No newline at end of file diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml index a575fcd..52640cb 100644 --- a/nifi-docker/dockermaven/pom.xml +++ b/nifi-docker/dockermaven/pom.xml @@ -111,6 +111,51 @@ </plugins> </build> </profile> + <profile> + <id>docker-skip-tests</id> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>docker-test-skip-test</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> \ No newline at end of file diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml b/nifi-toolkit/nifi-toolkit-assembly/pom.xml index 565b018..ebd7e0f 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml +++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml @@ -255,5 +255,58 @@ language governing permissions and limitations under the License. --> </plugins> </build> </profile> + <profile> + <id>docker-skip-tests</id> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests - exit codes</id> + <phase>none</phase> + </execution> + <execution> + <id>Docker integration tests - tls-toolkit</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>docker-test-skip-test</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Docker integration tests - exit codes</id> + <phase>none</phase> + </execution> + <execution> + <id>Docker integration tests - tls-toolkit</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
