[Bigdata-commit] SF.net SVN: bigdata:[4087] branches/QUADS_QUERY_BRANCH

[<tho...@us...>]

Revision: 4087
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4087&view=rev
Author:   thompsonbry
Date:     2011-01-13 20:25:42 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
zookeeper CI ant targets added

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.properties
    branches/QUADS_QUERY_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/build.properties
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.properties	2011-01-13 17:56:43 UTC (rev 4086)
+++ branches/QUADS_QUERY_BRANCH/build.properties	2011-01-13 20:25:42 UTC (rev 4087)
@@ -376,3 +376,7 @@
 # on a volume with a lot of room.  The directory may be destroyed (by the test harness)
 # after the performance tests have run their course.
 perf.run.dir=/usr/bigdata/runs
+
+# CI properties.
+test.zookeeper.installDir=/Users/bryan/zookeeper-3.2.1
+

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-01-13 17:56:43 UTC (rev 4086)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-01-13 20:25:42 UTC (rev 4087)
@@ -115,7 +115,7 @@
 	</target>
 
 	<!-- Builds the bigdata JAR and bundles it together with all of its dependencies in the ${build.dir}/lib directory. -->
-	<target name="bundleJar" depends="bundle, jar" description="Builds the bigdata JAR and bundles it together with all of its dependencies in the ${build.dir}/lib directory.">
+	<target name="bundleJar" depends="clean, bundle, jar" description="Builds the bigdata JAR and bundles it together with all of its dependencies in the ${build.dir}/lib directory.">
 		<copy file="${build.dir}/${version}.jar" todir="${build.dir}/lib" />
 		<!--<property name="myclasspath" refid="runtime.classpath" />
 		<echo message="${myclasspath}"/>-->
@@ -1599,6 +1599,18 @@
       <property name="test.codebase.dir" value="${dist.lib.dl}" />
       <property name="test.codebase" value="http://${this.hostname}:${test.codebase.port}/jsk-dl.jar" />
 
+      <!-- These zookeeper configuration properties used to inform the test -->
+      <!-- suite about the zookeeper instance which will be used by the     -->
+      <!-- tests. These properties MUST be consistent with the actual       -->
+      <!-- zookeeper configuration.  Zookeeper is assumed (by the tests) to -->
+      <!-- be running on the localhost.                                     -->
+      <property name="test.zookeeper.tickTime" value="2000" />
+      <property name="test.zookeeper.clientPort" value="2888" />
+      <property name="test.zookeeper.leaderPort" value="3888" />
+
+      <!-- The zookeeper install directory. -->
+      <property name="test.zookeeper.installDir" value="${zookeeper.installDir}" />
+
       <property name="java.security.policy" value="${dist.var.config.policy}/policy.all" />
       <property name="log4j.configuration" value="${bigdata.test.log4j.rel}" />
       <property name="java.net.preferIPv4Stack" value="true" />
@@ -1608,6 +1620,7 @@
       <copy file="${build.properties.from.file}"
             todir="${build.properties.test.to.path}" />
 
+      <antcall target="startZookeeper" />
       <antcall target="startHttpd" />
       <antcall target="startLookup" />
 
@@ -1616,6 +1629,7 @@
 
       <antcall target="stopLookup" />
       <antcall target="stopHttpd" />
+      <antcall target="stopZookeeper" />
 
       <!-- This message is noticed by the hudson build and is used to trigger
            after various after actions. -->
@@ -1690,6 +1704,22 @@
       </java>
     </target>
 
+    <target name="startZookeeper">
+    	<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
+        <echo>bin/zkServer.sh start
+</echo>
+    	<exec command="bin/zkServer.sh start" dir="${test.zookeeper.installDir}" logerror="true">
+</exec>
+    </target>
+
+    <target name="stopZookeeper">
+	<echo message="test.zookeeper.installDir=${test.zookeeper.installDir}"/>
+    <echo>bin/zkServer.sh start
+</echo>
+	<exec command="bin/zkServer.sh stop" dir="${test.zookeeper.installDir}" logerror="true">
+</exec>
+    </target>
+
     <!-- runs all junit tests -->
     <target name="run-junit">
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.