Repository: qpid-broker-j Updated Branches: refs/heads/master 54bc670f0 -> 4c89667b1
QPID-8158: [Broker-J] [System Tests] Skip running non-protocol integration tests by default Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4c89667b Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4c89667b Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4c89667b Branch: refs/heads/master Commit: 4c89667b1d83a1cac022c86885cc6f806862afcc Parents: 54bc670 Author: Alex Rudyy <oru...@apache.org> Authored: Thu Apr 12 17:39:07 2018 +0100 Committer: Alex Rudyy <oru...@apache.org> Committed: Thu Apr 12 17:39:07 2018 +0100 ---------------------------------------------------------------------- qpid-systests-parent/pom.xml | 7 +++---- systests/end-to-end-conversion-tests/pom.xml | 8 +------- systests/protocol-tests-amqp-0-10/pom.xml | 12 ++++++++++++ systests/protocol-tests-amqp-0-8/pom.xml | 12 ++++++++++++ systests/protocol-tests-amqp-1-0/pom.xml | 12 ++++++++++++ 5 files changed, 40 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4c89667b/qpid-systests-parent/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml index 4dade4a..6fb8b0d 100644 --- a/qpid-systests-parent/pom.xml +++ b/qpid-systests-parent/pom.xml @@ -31,7 +31,7 @@ <description>Parent POM for Qpid system testing modules</description> <properties> - <skip.systests>${skipTests}</skip.systests> + <skipITs>true</skipITs> </properties> <dependencies> @@ -71,8 +71,7 @@ <configuration> <!-- Skip the default test phase, bind to the integration-test phase below instead --> - <skip>true</skip> - <skipTests>${skip.systests}</skipTests> + <skipTests>true</skipTests> </configuration> <executions> <execution> @@ -82,7 +81,7 @@ <goal>test</goal> </goals> <configuration> - <skip>false</skip> + <skipTests>${skipITs}</skipTests> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4c89667b/systests/end-to-end-conversion-tests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml index 2c44210..3979fa4 100644 --- a/systests/end-to-end-conversion-tests/pom.xml +++ b/systests/end-to-end-conversion-tests/pom.xml @@ -82,7 +82,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skipTests>${skipTests}</skipTests> + <skipTests>${skipITs}</skipTests> <workingDirectory>${project.basedir}</workingDirectory> <systemPropertyVariables> <qpid.initialConfigurationLocation>classpath:config-end-to-end-conversion-tests.json</qpid.initialConfigurationLocation> @@ -94,7 +94,6 @@ <execution> <id>0-9-1 -> 1.0</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_1.0</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> @@ -110,7 +109,6 @@ <execution> <id>1.0 -> 0-9-1</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-9-1</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> @@ -126,7 +124,6 @@ <execution> <id>0-10 -> 1.0</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>0-10_to_1.0</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> @@ -142,7 +139,6 @@ <execution> <id>1.0 -> 0-10</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-10</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> @@ -158,7 +154,6 @@ <execution> <id>0-9-1 -> 0-10</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_0-10</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> @@ -174,7 +169,6 @@ <execution> <id>0-10 -> 0-9-1</id> <configuration> - <skip>false</skip> <systemPropertyVariables> <qpid.systests.end_to_end_conversion.executionId>0-10_to_0-9-1</qpid.systests.end_to_end_conversion.executionId> <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4c89667b/systests/protocol-tests-amqp-0-10/pom.xml ---------------------------------------------------------------------- diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml index 3acf129..53b049e 100644 --- a/systests/protocol-tests-amqp-0-10/pom.xml +++ b/systests/protocol-tests-amqp-0-10/pom.xml @@ -102,6 +102,18 @@ <qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-10.json</qpid.initialConfigurationLocation> </systemPropertyVariables> </configuration> + <executions> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skipTests>${skipTests}</skipTests> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4c89667b/systests/protocol-tests-amqp-0-8/pom.xml ---------------------------------------------------------------------- diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml index 3f788db..4a99449 100644 --- a/systests/protocol-tests-amqp-0-8/pom.xml +++ b/systests/protocol-tests-amqp-0-8/pom.xml @@ -102,6 +102,18 @@ <qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-8.json</qpid.initialConfigurationLocation> </systemPropertyVariables> </configuration> + <executions> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skipTests>${skipTests}</skipTests> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4c89667b/systests/protocol-tests-amqp-1-0/pom.xml ---------------------------------------------------------------------- diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml index ee5bd9f..5cc7856 100644 --- a/systests/protocol-tests-amqp-1-0/pom.xml +++ b/systests/protocol-tests-amqp-1-0/pom.xml @@ -122,6 +122,18 @@ <qpid.initialConfigurationLocation>classpath:config-protocol-tests.json</qpid.initialConfigurationLocation> </systemPropertyVariables> </configuration> + <executions> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skipTests>${skipTests}</skipTests> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org