Michael Blow has submitted this change and it was merged. Change subject: Don't Start Stop Hyracks Cluster When -DskipTests ......................................................................
Don't Start Stop Hyracks Cluster When -DskipTests Wrap starting / stopping Hyracks cluster in profile which is disabled when 'skipTests' is set. Change-Id: Ifdde6b78fe1b0e9ac76b91a32bff279a1814db51 Reviewed-on: https://asterix-gerrit.ics.uci.edu/931 Reviewed-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: abdullah alamoudi <bamou...@gmail.com> --- M hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml 2 files changed, 161 insertions(+), 133 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Looks good to me, but someone else must approve; Verified diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml index b69b280..63d01ad 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml @@ -81,69 +81,6 @@ </plugin> <plugin> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-virtualcluster-maven-plugin</artifactId> - <version>0.2.18-SNAPSHOT</version> - <configuration> - <hyracksServerHome>${basedir}/target/hyracks-shutdown-test-${project.version}-binary-assembly</hyracksServerHome> - <jvmOptions>${jvm.extraargs}</jvmOptions> - </configuration> - <executions> - <execution> - <id>hyracks-cc-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-cc</goal> - </goals> - </execution> - <execution> - <id>hyracks-nc1-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-nc</goal> - </goals> - <configuration> - <nodeId>NC1</nodeId> - <dataIpAddress>127.0.0.1</dataIpAddress> - <ccHost>localhost</ccHost> - </configuration> - </execution> - <execution> - <id>hyracks-nc2-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-nc</goal> - </goals> - <configuration> - <nodeId>NC2</nodeId> - <dataIpAddress>127.0.0.1</dataIpAddress> - <ccHost>localhost</ccHost> - </configuration> - </execution> - <execution> - <id>stop-services</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop-services</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.8.1</version> - <executions> - <execution> - <id>it</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> @@ -152,6 +89,83 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>run-tests</id> + <activation> + <property> + <name>!skipTests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-virtualcluster-maven-plugin</artifactId> + <version>0.2.18-SNAPSHOT</version> + <configuration> + <hyracksServerHome>${basedir}/target/hyracks-shutdown-test-${project.version}-binary-assembly</hyracksServerHome> + <jvmOptions>${jvm.extraargs}</jvmOptions> + </configuration> + <executions> + <execution> + <id>hyracks-cc-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-cc</goal> + </goals> + </execution> + <execution> + <id>hyracks-nc1-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-nc</goal> + </goals> + <configuration> + <nodeId>NC1</nodeId> + <dataIpAddress>127.0.0.1</dataIpAddress> + <ccHost>localhost</ccHost> + </configuration> + </execution> + <execution> + <id>hyracks-nc2-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-nc</goal> + </goals> + <configuration> + <nodeId>NC2</nodeId> + <dataIpAddress>127.0.0.1</dataIpAddress> + <ccHost>localhost</ccHost> + </configuration> + </execution> + <execution> + <id>stop-services</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop-services</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.8.1</version> + <executions> + <execution> + <id>it</id> + <phase>integration-test</phase> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml index f9dc917..babc01e 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml @@ -79,78 +79,92 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-virtualcluster-maven-plugin</artifactId> - <version>0.2.18-SNAPSHOT</version> - <configuration> - <hyracksServerHome>${basedir}/target/textserver-${project.version}-binary-assembly</hyracksServerHome> - <jvmOptions>${jvm.extraargs}</jvmOptions> - </configuration> - <executions> - <execution> - <id>hyracks-cc-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-cc</goal> - </goals> - </execution> - <execution> - <id>hyracks-nc1-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-nc</goal> - </goals> - <configuration> - <nodeId>NC1</nodeId> - <dataIpAddress>127.0.0.1</dataIpAddress> - <ccHost>localhost</ccHost> - </configuration> - </execution> - <execution> - <id>hyracks-nc2-start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start-nc</goal> - </goals> - <configuration> - <nodeId>NC2</nodeId> - <dataIpAddress>127.0.0.1</dataIpAddress> - <ccHost>localhost</ccHost> - </configuration> - </execution> - <execution> - <id>stop-services</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop-services</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.8.1</version> - <executions> - <execution> - <id>it</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </build> + <profiles> + <profile> + <id>run-tests</id> + <activation> + <property> + <name>!skipTests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-virtualcluster-maven-plugin</artifactId> + <version>0.2.18-SNAPSHOT</version> + <configuration> + <hyracksServerHome>${basedir}/target/textserver-${project.version}-binary-assembly</hyracksServerHome> + <jvmOptions>${jvm.extraargs}</jvmOptions> + </configuration> + <executions> + <execution> + <id>hyracks-cc-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-cc</goal> + </goals> + </execution> + <execution> + <id>hyracks-nc1-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-nc</goal> + </goals> + <configuration> + <nodeId>NC1</nodeId> + <dataIpAddress>127.0.0.1</dataIpAddress> + <ccHost>localhost</ccHost> + </configuration> + </execution> + <execution> + <id>hyracks-nc2-start</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-nc</goal> + </goals> + <configuration> + <nodeId>NC2</nodeId> + <dataIpAddress>127.0.0.1</dataIpAddress> + <ccHost>localhost</ccHost> + </configuration> + </execution> + <execution> + <id>stop-services</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop-services</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.8.1</version> + <executions> + <execution> + <id>it</id> + <phase>integration-test</phase> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>junit</groupId> -- To view, visit https://asterix-gerrit.ics.uci.edu/931 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifdde6b78fe1b0e9ac76b91a32bff279a1814db51 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <michael.b...@couchbase.com> Gerrit-Reviewer: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <michael.b...@couchbase.com> Gerrit-Reviewer: abdullah alamoudi <bamou...@gmail.com>
