You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2016/06/17 02:43:28 UTC

asterixdb git commit: Don't Start Stop Hyracks Cluster When -DskipTests

Repository: asterixdb
Updated Branches:
  refs/heads/master fd1d460da -> 98ddabc77


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 <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/98ddabc7
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/98ddabc7
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/98ddabc7

Branch: refs/heads/master
Commit: 98ddabc775222da5c0bc302855661cf7d388afff
Parents: fd1d460
Author: Michael Blow <mb...@apache.org>
Authored: Thu Jun 16 21:02:29 2016 -0400
Committer: Michael Blow <mi...@couchbase.com>
Committed: Thu Jun 16 19:42:54 2016 -0700

----------------------------------------------------------------------
 .../hyracks-shutdown-test/pom.xml               | 140 +++++++++--------
 .../text-example/textserver/pom.xml             | 150 ++++++++++---------
 2 files changed, 159 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98ddabc7/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
----------------------------------------------------------------------
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>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98ddabc7/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml
----------------------------------------------------------------------
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>
+    </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>
-              <nodeId>NC1</nodeId>
-              <dataIpAddress>127.0.0.1</dataIpAddress>
-              <ccHost>localhost</ccHost>
+              <hyracksServerHome>${basedir}/target/textserver-${project.version}-binary-assembly</hyracksServerHome>
+              <jvmOptions>${jvm.extraargs}</jvmOptions>
             </configuration>
-          </execution>
-          <execution>
-            <id>hyracks-nc2-start</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start-nc</goal>
-            </goals>
+            <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>
-              <nodeId>NC2</nodeId>
-              <dataIpAddress>127.0.0.1</dataIpAddress>
-              <ccHost>localhost</ccHost>
+              <skip>true</skip>
             </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>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>