Michael Blow has submitted this change and it was merged. Change subject: Localize asterix-installer failsafe excludes ......................................................................
Localize asterix-installer failsafe excludes Ensure no other modules are affected by asterix-installer failsafe exclusions by locating the exclusions to the asterix-installer module Change-Id: I44cb8f29d8d8e7c1e9e394be4ec8d9f41e7b8a44 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1841 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> BAD: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Till Westmann <ti...@apache.org> --- M asterixdb/asterix-installer/pom.xml M asterixdb/pom.xml 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; No violations found; Verified diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml index ff4036c..344180e 100644 --- a/asterixdb/asterix-installer/pom.xml +++ b/asterixdb/asterix-installer/pom.xml @@ -27,6 +27,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory> + + <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes> + <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes> + <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes> </properties> <licenses> @@ -307,6 +311,17 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>${failsafe.test.excludes}</exclude> + <exclude>${cluster.test.excludes}</exclude> + <exclude>${cluster.extest.excludes}</exclude> + </excludes> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index b708187..e49f9aa 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -58,10 +58,6 @@ <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes> <global.test.excludes>${invalid.tests},${repeated.tests}</global.test.excludes> - <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes> - <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes> - <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes> - <!-- Versions under dependencymanagement or used in many projects via properties --> <algebricks.version>0.3.2-SNAPSHOT</algebricks.version> <hyracks.version>0.3.2-SNAPSHOT</hyracks.version> @@ -117,11 +113,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <argLine>${coverageArgLine}</argLine> - <excludes> - <exclude>${failsafe.test.excludes}</exclude> - <exclude>${cluster.test.excludes}</exclude> - <exclude>${cluster.extest.excludes}</exclude> - </excludes> </configuration> <executions> <execution> -- To view, visit https://asterix-gerrit.ics.uci.edu/1841 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44cb8f29d8d8e7c1e9e394be4ec8d9f41e7b8a44 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org>
