Repository: asterixdb Updated Branches: refs/heads/master 7b8e5a2a5 -> e30c9d3c0
[NO ISSUE] Move jenkins test suites into poms Avoid issues corodinating git & Jenkins config changes to test config, by defining job profiles in the pom files. Change-Id: I3fed5c3d578d8c5faa95d22cbdb33b1bac8f7190 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2306 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Contrib: Michael Blow <[email protected]> Contrib: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e30c9d3c Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e30c9d3c Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e30c9d3c Branch: refs/heads/master Commit: e30c9d3c04e1c010d687ecf664c1d2b95d1a0fde Parents: 7b8e5a2 Author: Michael Blow <[email protected]> Authored: Sat Jan 20 09:42:19 2018 -0500 Committer: Michael Blow <[email protected]> Committed: Sat Jan 20 11:51:53 2018 -0800 ---------------------------------------------------------------------- asterixdb/asterix-app/pom.xml | 28 ++++++++++++++++++++++++++++ asterixdb/pom.xml | 16 ++++++++++++++-- hyracks-fullstack/pom.xml | 10 ++++++---- 3 files changed, 48 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e30c9d3c/asterixdb/asterix-app/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index dc00bea..c32872a 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -280,6 +280,34 @@ </plugins> </build> </profile> + <profile> + <id>asterix-gerrit-asterix-app</id> + <properties> + <test.excludes>**/SqlppExecutionWithCancellationTest.java,**/DmlTest.java,**/RepeatedTest.java,**/SqlppExecutionTest.java</test.excludes> + </properties> + </profile> + <profile> + <id>asterix-gerrit-asterix-app-sql-execution</id> + <properties> + <test.includes/> + <itest.includes>**/SqlppExecution*IT.java</itest.includes> + <failIfNoTests>false</failIfNoTests> + </properties> + </profile> + <profile> + <id>asterix-gerrit-verify-asterix-app</id> + <properties> + <test.includes/> + <itest.excludes>**/SqlppExecution*IT.java,**/RebalanceWithCancellationIT.java</itest.excludes> + <failIfNoTests>false</failIfNoTests> + </properties> + </profile> + <profile> + <id>asterix-gerrit-rebalance-cancellation</id> + <properties> + <test.includes>**/RebalanceWithCancellationIT.java</test.includes> + </properties> + </profile> </profiles> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e30c9d3c/asterixdb/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index a3f8848..3850a85 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -62,6 +62,12 @@ <invalid.tests>**/DmlTest.java</invalid.tests> <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes> <global.test.excludes>${invalid.tests},${repeated.tests}</global.test.excludes> + <test.includes>${global.test.includes}</test.includes> + <test.excludes>${global.test.excludes}</test.excludes> + <global.itest.includes>**/*IT.java,**/*IT.java,**/*ITCase.java</global.itest.includes> + <global.itest.excludes/> + <itest.includes>${global.itest.includes}</itest.includes> + <itest.excludes>${global.itest.excludes}</itest.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> <algebricks.version>0.3.3-SNAPSHOT</algebricks.version> @@ -101,10 +107,10 @@ ${coverageArgLine} </argLine> <includes> - <include>${global.test.includes},${test.includes}</include> + <include>${test.includes}</include> </includes> <excludes> - <exclude>${global.test.excludes},${test.excludes}</exclude> + <exclude>${test.excludes}</exclude> </excludes> <skipTests>${skip.surefire.tests}</skipTests> </configuration> @@ -120,6 +126,12 @@ <systemProperties> <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> </systemProperties> + <includes> + <include>${itest.includes}</include> + </includes> + <excludes> + <exclude>${itest.excludes}</exclude> + </excludes> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e30c9d3c/hyracks-fullstack/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index f08bec6..6e3d71f 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -57,6 +57,7 @@ <jvm.extraargs /> <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath> <source-format.skip>false</source-format.skip> + <skipTests>false</skipTests> <skip.surefire.tests>${skipTests}</skip.surefire.tests> <skip.testResources>${maven.test.skip}</skip.testResources> <testLog4jConfigFile>${root.dir}/src/test/resources/log4j2-test.xml</testLog4jConfigFile> @@ -64,8 +65,9 @@ <hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests> <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests> <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes> - <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests} - </global.test.excludes> + <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests}</global.test.excludes> + <test.includes>${global.test.includes}</test.includes> + <test.excludes>${global.test.excludes}</test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> <hadoop.version>2.2.0</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> @@ -267,10 +269,10 @@ <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> </systemPropertyVariables> <includes> - <include>${global.test.includes},${test.includes}</include> + <include>${test.includes}</include> </includes> <excludes combine.children="append"> - <exclude>${global.test.excludes},${test.excludes}</exclude> + <exclude>${test.excludes}</exclude> </excludes> <skipTests>${skip.surefire.tests}</skipTests> </configuration>
