[jboss-cvs] JBossAS SVN: r106077 - in branches/Branch_No_Multicast: testsuite and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2010-06-15 20:38:56 -0400 (Tue, 15 Jun 2010)
New Revision: 106077

Modified:
   branches/Branch_No_Multicast/build/build.xml
   branches/Branch_No_Multicast/testsuite/build.xml
   branches/Branch_No_Multicast/testsuite/imports/server-config.xml
Log:
[JBPAPP-4482] Switch build order so cluster-ec2 uses patched "production". Add a tests-ec2 target

Modified: branches/Branch_No_Multicast/build/build.xml
===================================================================
--- branches/Branch_No_Multicast/build/build.xml	2010-06-15 21:03:26 UTC (rev 106076)
+++ branches/Branch_No_Multicast/build/build.xml	2010-06-16 00:38:56 UTC (rev 106077)
@@ -768,12 +768,15 @@
     <antcall target="partition-community-ewp"/>
     <antcall target="partition-production"/>
     <antcall target="partition-production-ewp"/>
-    <antcall target="partition-ec2"/>
     <antcall target="jboss-all-client"/>
     <!--<antcall target="setup-ejb3-dist"/>-->
     <antcall target="apply_auth_patch"/>
     <antcall target="skipped_auth_patch"/>
     <antcall target="apply_patch"/>
+  	 <!-- Build cluster-ec2 last so it gets the benefit of the above patches
+  	      TODO: maybe not ideal; better to build it and extend the patches to
+  	      cover it? -->
+    <antcall target="partition-ec2"/>
   </target>
 
   <target name="apply_auth_patch" unless="build.unsecure">

Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml	2010-06-15 21:03:26 UTC (rev 106076)
+++ branches/Branch_No_Multicast/testsuite/build.xml	2010-06-16 00:38:56 UTC (rev 106077)
@@ -1615,16 +1615,19 @@
 
    <target name="jboss-all-config-tests"
       description="The units tests which are run against the jboss all config" depends="init">
-   	  
+   	
+   	<!-- Default configuration to run the tests against -->
+   	<property name="conf" value="all"/>
+   	       
    	  <echo message="Replacing hornetq-roles and hornetq-users.properties used for tests"/>
    	
  	  <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties" 
- 	  	  tofile="${jboss.dist}/server/all/conf/props/hornetq-roles.properties" overwrite="true"/>
+ 	  	  tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-roles.properties" overwrite="true"/>
     
  	  <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties" 
- 	  	  tofile="${jboss.dist}/server/all/conf/props/hornetq-users.properties" overwrite="true"/>
+ 	  	  tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
     
-   	  <server:start name="all"/>
+   	  <server:start name="${conf}"/>
       <antcall target="tests-standard-unit"/>
       <antcall target="tests-client-unit"/>
       <antcall target="tests-security-basic-unit"/>
@@ -1636,8 +1639,17 @@
       <antcall target="tests-scout-jaxr"/>
       <antcall target="tests-webservice" />
       <antcall target="tests-aspects"/>
-      <server:stop name="all"/>
+      <server:stop name="${conf}"/>
    </target>
+	
+	<target name="tests-ec2"
+      description="Runs the various test targets, but against cluster-ec2 config" depends="init">
+		
+		<property name="conf" value="cluster-ec2"/>
+		
+		<antcall target="jboss-all-config-tests" inheritrefs="true"/>
+		<antcall target="tests-clustering-ec2" inheritrefs="true"/>
+	</target>
 
    <target name="smoke-tests"
       description="A basic set of units tests which are run against the jboss all config" depends="init">

Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-15 21:03:26 UTC (rev 106076)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-16 00:38:56 UTC (rev 106077)
@@ -101,6 +101,29 @@
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
       </server>
+      <server name="cluster-ec2" host="${node0}">
+<!--
+         <jvmarg value="-agentlib:yjpagent" />
+         <jvmarg value="-Xrunyjpagent:sessionname=JBoss" />
+-->
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx768m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />
+         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+         <jvmarg value="-XX:-UseGCOverheadLimit" />
+<!--
+         <jvmarg value="-Dcom.sun.management.jmxremote" />
+         <jvmarg value="-XX:MaxPermSize=512m" />
+         <jvmarg value="-Xmx512m" />
+-->
+         <sysproperty key="java.net.preferIPv4Stack" value="true" />
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+         <sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
+         <sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
+      </server>
       <server name="securitymgr" config="secmgr" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms128m" />