[Jboss-cvs] JBossAS SVN: r54899 - trunk/tools/etc/cruisecontrol/templates

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jul 29 22:54:11 EDT 2006


Author: rrajesh
Date: 2006-07-29 22:54:09 -0400 (Sat, 29 Jul 2006)
New Revision: 54899

Modified:
   trunk/tools/etc/cruisecontrol/templates/jbosslabstemplate.vm
   trunk/tools/etc/cruisecontrol/templates/projects-db.xml
   trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml
   trunk/tools/etc/cruisecontrol/templates/projects.xml
   trunk/tools/etc/cruisecontrol/templates/projecttemplate.vm
Log:
Refactored cruisecontrol scripts to support jbossas svn migration.

Modified: trunk/tools/etc/cruisecontrol/templates/jbosslabstemplate.vm
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/jbosslabstemplate.vm	2006-07-30 02:09:36 UTC (rev 54898)
+++ trunk/tools/etc/cruisecontrol/templates/jbosslabstemplate.vm	2006-07-30 02:54:09 UTC (rev 54899)
@@ -13,11 +13,15 @@
 		<!-- Defines where cruise looks for changes, to decide whether to run the build -->
 		<!-- quietperiod - seconds to wait for no changes before doing a build -->
 		#set( $requiremodification = $project.getAttributeValue("requiremodification") )
+                #set( $modificationset1 =  $project.getAttributeValue("modificationset1") )
+                #set( $modificationset2 = $project.getAttributeValue("modificationset2") )		
 		#set( $fakeModset = $project.getAttributeValue("fakeModset") )
 		#set( $tag = $project.getAttributeValue("tag") )
 		#set( $buildstatuslogdir = $project.getAttributeValue("buildstatuslogdir") )
 <modificationset quietperiod="$project.getAttributeValue("quietperiod")" #if( !($requiremodification == "")) requiremodification="$requiremodification" #end>
 		    <svn localworkingcopy="checkout/$project.getAttributeValue("modificationset")" #if( !($tag == "") ) tag="$project.getAttributeValue("tag")" #end/>
+#if( !($modificationset1 == "") ) <svn localworkingcopy="checkout/$modificationset1" #if( !($tag == "") ) tag="$project.getAttributeValue("tag")" #end/> #end
+#if( !($modificationset2 == "") ) <svn localworkingcopy="checkout/$modificationset2" #if( !($tag == "") ) tag="$project.getAttributeValue("tag")" #end/> #end		    
 		    #if( !($buildstatuslogdir == "")) <buildstatus logdir="$buildstatuslogdir"/>  #end
 		    #if( !($fakeModset ==""))
 		    <!-- use this for testing, don't wait for cvs log-->
@@ -28,12 +32,14 @@
 		<!-- Configures the actual build loop, how often and which build file/target -->
 		<!-- interval - (300) num seconds between checks -->
 		#set( $jbossdir = $project.getAttributeValue("jbossdir") )
+		#set( $svnurl = $project.getAttributeValue("svnurl") )
 		#set( $scheduleinterval = $project.getAttributeValue("scheduleinterval") )
 		#set( $time = $project.getAttributeValue("time") )		
 		<schedule #if( !($scheduleinterval == "") ) interval="$project.getAttributeValue("scheduleinterval")" #end>
                     <ant buildfile="$project.getAttributeValue("buildfile")" target="$project.getAttributeValue("target")" antscript="/opt/apache-ant-1.6.2/bin/ant" #if( !($time == "") ) time="$project.getAttributeValue("time")" #end
                          uselogger="$project.getAttributeValue("uselogger")" usedebug="$project.getAttributeValue("usedebug")" timeout="$project.getAttributeValue("timeout")" antWorkingDir="scripts">
 #if( !($jbossdir == "")) <property name="jboss.dir" value="$jbossdir"/> #end
+#if( !($svnurl == "")) <property name="svn.url" value="$svnurl"/> #end
                     </ant>	
 		</schedule>
 

Modified: trunk/tools/etc/cruisecontrol/templates/projects-db.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects-db.xml	2006-07-30 02:09:36 UTC (rev 54898)
+++ trunk/tools/etc/cruisecontrol/templates/projects-db.xml	2006-07-30 02:54:09 UTC (rev 54899)
@@ -24,8 +24,8 @@
            cvsmodule=""
            jbossdir=""           
            emailFrom="qa at jboss.com"
-           emailFailureTo="cbauer at jboss.com,sebersole at jboss.com"
-           emailAlwaysTo="hibernate-devel at lists.sourceforge.net"
+           emailFailureTo="sebersole at jboss.com"
+           emailAlwaysTo="hibernate-dev at lists.jboss.org"
            skipusers="false"
            reportWhenFixed="true">
   </defaultproject>
@@ -47,6 +47,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode hsqldb"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -58,6 +59,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode oracle10"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -69,6 +71,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode mysql"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -80,6 +83,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode sybase"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -91,6 +95,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode sqlserver"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -102,6 +107,7 @@
            buildfile="build-hibernate-db-matrix.xml"
            target="getcode timesten"
            timeout="10800"
+           skipusers="true"
            logbuilddirectory="hibernate-db-matrix"
            testResults="checkout/hibernate-db-matrix/build/testout/TESTS-TestSuites.xml">
   </project>
@@ -205,7 +211,7 @@
            emailAlwaysTo="qa at jboss.com">
   </project>
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="cruisecontrol"
            modificationset="cruisecontrol"
            requiremodification="true"
@@ -214,8 +220,9 @@
            target="build"
            timeout="3600"
            logbuilddirectory="cruisecontrol"
-           emailFailureTo="qa-internal at jboss.com,rrajasekaran at jboss.com"
-           emailAlwaysTo="qa-internal at jboss.com,rrajasekaran at jboss.com">
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk/tools/etc/cruisecontrol"           
+           jbossdir="cruisecontrol"           
+           emailFailureTo="qa-internal at jboss.com"
+           emailAlwaysTo="qa-internal at jboss.com">
   </project>
-
 </projects>

Modified: trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml	2006-07-30 02:09:36 UTC (rev 54898)
+++ trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml	2006-07-30 02:54:09 UTC (rev 54899)
@@ -22,7 +22,8 @@
            testResults=""
            cvsbranch=""
            cvsmodule=""
-           jbossdir=""           
+           jbossdir=""
+           svnurl=""
            emailFrom="qa at jboss.com"
            emailFailureTo="jboss-development at lists.jboss.org"
            emailAlwaysTo="qa at jboss.com"
@@ -31,18 +32,17 @@
   </defaultproject>
 
   
-  <testattributes testMode="no"
+  <testattributes testMode="yes"
 	   skipusers="true"
-  	   emailFrom="rrajasekaran at jboss.com"
-           emailFailureTo="rrajasekaran at jboss.com"
-           emailAlwaysTo="ryan.campbell at jboss.com">
+  	   emailFrom="qa at jboss.com"
+           emailFailureTo="qa at jboss.com"
+           emailAlwaysTo="qa at jboss.com">
   </testattributes>  
 
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
 	   name="jboss-3.2-jdk-matrix"
 	   modificationset="jboss-3.2.x"
-	   tag="Branch_3_2"
 	   requiremodification="true"
 	   scheduleinterval="900"
 	   buildfile="build-jboss-common.xml"
@@ -50,15 +50,14 @@
            timeout="7200"
 	   logbuilddirectory="jboss-3.2.x"
 	   testResults="checkout/jboss-3.2.x/testsuite/output/reports/TESTS-TestSuites.xml"
-	   cvsbranch="Branch_3_2"
-	   cvsmodule="jboss-3.2.x">
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_3_2"
+	   jbossdir="jboss-3.2.x">
   </project>
 
     
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-4.0-jdk-matrix"
            modificationset="jboss-4.0.x"
-           tag="Branch_4_0"
 	   requiremodification="true"           
            scheduleinterval="900"
            buildfile="build-jboss-common.xml"
@@ -66,12 +65,12 @@
            timeout="7200"
            logbuilddirectory="jboss-4.0.x"
            testResults="checkout/jboss-4.0.x/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_4_0"
-           cvsmodule="jboss-4.0.x">
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"           
+           jbossdir="jboss-4.0.x">
   </project>
 
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-head-jdk-matrix"
            modificationset="jboss-head"
            requiremodification="true" 
@@ -81,11 +80,11 @@
            timeout="7200"
            logbuilddirectory="jboss-head"
            testResults="checkout/jboss-head/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           cvsmodule="jboss-head">
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"           
+           jbossdir="jboss-head">
   </project>
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="cruisecontrol"
            modificationset="cruisecontrol"
            requiremodification="true"
@@ -94,8 +93,10 @@
            target="build"
            timeout="3600"
            logbuilddirectory="cruisecontrol"
-           emailFailureTo="qa-internal at jboss.com,rrajasekaran at jboss.com"
-           emailAlwaysTo="qa-internal at jboss.com,rrajasekaran at jboss.com">
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk/tools/etc/cruisecontrol"           
+           jbossdir="cruisecontrol"           
+           emailFailureTo="qa-internal at jboss.com"
+           emailAlwaysTo="qa-internal at jboss.com">
   </project>
 
   <project template="projecttemplate.vm"
@@ -171,26 +172,8 @@
            testResults="checkout/jbossws-head-testsuite-1.5/output/tests/reports/TESTS-TestSuites.xml"
            jbossdir="jbossws-head-testsuite-1.5">
   </project>  
-<!--
-  <project template="projecttemplate.vm"
-           name="jboss-4.0.4.SP-testsuite"
-           buildafterfailed="true"
-           modificationset="jboss-4.0.4.SP-testsuite"
-           tag="JBoss_4_0_4_SP"
-	   requiremodification="true"           
-           scheduleinterval="3600"
-           buildfile="build-jboss-common.xml"
-           target="test copyresults"
-           timeout="14400"
-           logbuilddirectory="jboss-4.0.4.SP-testsuite"
-           testResults="checkout/jboss-4.0.4.SP-testsuite/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="JBoss_4_0_4_SP"
-           cvsmodule="jboss-4.0.x"
-           jbossdir="jboss-4.0.4.SP-testsuite">
-  </project>
-  -->
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jms-head-testsuite"
            modificationset="jms-head-testsuite/jms"
            requiremodification="false"
@@ -201,7 +184,9 @@
            logbuilddirectory="jms-head-testsuite"
            testResults="checkout/jms-head-testsuite/jms/tests/output/reports/TESTS-TestSuites.xml"
            emailFailureTo="ovidiu.feodorov at jboss.com,tim.fox at jboss.com,qa at jboss.com"
-           emailAlwaysTo="ovidiu.feodorov at jboss.com,tim.fox at jboss.com,qa at jboss.com">
+           emailAlwaysTo="ovidiu.feodorov at jboss.com,tim.fox at jboss.com,qa at jboss.com"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"           
+           jbossdir="jms-head-testsuite">
   </project> 
   
   <project template="jbosslabstemplate.vm"
@@ -215,6 +200,7 @@
            timeout="7200"
            logbuilddirectory="jboss-4.0-common"
            testResults="checkout/jboss-4.0-common/output/tests/reports/TESTS-TestSuites.xml"          
+           svnurl="http://anonsvn.jboss.org/repos/common/branches/Branch_4_0"
            jbossdir="jboss-4.0-common">
   </project>  
   
@@ -228,10 +214,11 @@
            target="build"
            timeout="7200"
            logbuilddirectory="jboss-head-common"
-           testResults="checkout/jboss-head-common/output/tests/reports/TESTS-TestSuites.xml"          
+           testResults="checkout/jboss-head-common/output/tests/reports/TESTS-TestSuites.xml"
+           svnurl="http://anonsvn.jboss.org/repos/common/trunk"
            jbossdir="jboss-head-common">
   </project> 
-  
+<!--
   <project template="jbosslabstemplate.vm"
            name="jboss-4.0-jdk-matrix-svn"
            modificationset="jboss-4.0-jdk-matrix-svn"
@@ -244,4 +231,5 @@
            testResults="checkout/jboss-4.0-jdk-matrix-svn/testsuite/output/reports/TESTS-TestSuites.xml"
            jbossdir="jboss-4.0-jdk-matrix-svn">
   </project>  
+  -->
 </projects>

Modified: trunk/tools/etc/cruisecontrol/templates/projects.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects.xml	2006-07-30 02:09:36 UTC (rev 54898)
+++ trunk/tools/etc/cruisecontrol/templates/projects.xml	2006-07-30 02:54:09 UTC (rev 54899)
@@ -22,7 +22,8 @@
            testResults=""
            cvsbranch=""
            cvsmodule=""
-           jbossdir=""           
+           jbossdir=""
+           svnurl=""
            emailFrom="qa at jboss.com"
            emailFailureTo="jboss-development at lists.jboss.org"
            emailAlwaysTo="qa at jboss.com"
@@ -31,15 +32,15 @@
   </defaultproject>
 
   
-  <testattributes testMode="no"
+  <testattributes testMode="yes"
 	   skipusers="true"
-  	   emailFrom="rrajasekaran at jboss.com"
-           emailFailureTo="rrajasekaran at jboss.com"
-           emailAlwaysTo="ryan.campbell at jboss.com">
+  	   emailFrom="qa at jboss.com"
+           emailFailureTo="qa at jboss.com"
+           emailAlwaysTo="qa at jboss.com">
   </testattributes>  
 
   
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="ejb3-4.0-testsuite"
            modificationset="ejb3-4.0-testsuite/ejb3"
            requiremodification="false"
@@ -48,11 +49,13 @@
            target="copyresults"
 	   timeout="7200"
            logbuilddirectory="ejb3-4.0-testsuite"
-           testResults="checkout/ejb3-4.0-testsuite/ejb3/output/reports/TESTS-TestSuites.xml">
+           testResults="checkout/ejb3-4.0-testsuite/ejb3/output/reports/TESTS-TestSuites.xml"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
+           jbossdir="ejb3-4.0-testsuite">
   </project>
   
   
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="ejb3-head-testsuite"
            modificationset="ejb3-head-testsuite/ejb3"
            requiremodification="false"
@@ -61,31 +64,16 @@
            target="copyresults"
            timeout="7200"
            logbuilddirectory="ejb3-head-testsuite"
-           testResults="checkout/ejb3-head-testsuite/ejb3/output/reports/TESTS-TestSuites.xml">
+           testResults="checkout/ejb3-head-testsuite/ejb3/output/reports/TESTS-TestSuites.xml"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"
+           jbossdir="ejb3-head-testsuite">
   </project>  
-
- <!--   
-  <project template="projecttemplate.vm"
-	   name="jboss-3.2-jdk-matrix"
-	   modificationset="jboss-3.2.x"
-	   tag="Branch_3_2"
-	   requiremodification="true"
-	   scheduleinterval="900"
-	   buildfile="build-jboss-common.xml"
-	   target="build-3.2-jdks"
-           timeout="7200"
-	   logbuilddirectory="jboss-3.2.x"
-	   testResults="checkout/jboss-3.2.x/testsuite/output/reports/TESTS-TestSuites.xml"
-	   cvsbranch="Branch_3_2"
-	   cvsmodule="jboss-3.2.x">
-  </project>
--->    
+   
     
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
 	   name="jboss-3.2-testsuite"
 	   buildafterfailed="true"
 	   modificationset="jboss-3.2-testsuite"
-	   tag="Branch_3_2"
 	   requiremodification="false"
 	   time="2200"
 	   buildfile="build-jboss-common.xml"
@@ -93,32 +81,15 @@
            timeout="7200"
 	   logbuilddirectory="jboss-3.2-testsuite"
 	   testResults="checkout/jboss-3.2-testsuite/testsuite/output/reports/TESTS-TestSuites.xml"
-	   cvsbranch="Branch_3_2"
-	   cvsmodule="jboss-3.2.x"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_3_2"	   
 	   jbossdir="jboss-3.2-testsuite">
   </project>   
     
- <!--   
-  <project template="projecttemplate.vm"
-           name="jboss-4.0-jdk-matrix"
-           modificationset="jboss-4.0.x"
-           tag="Branch_4_0"
-	   requiremodification="true"           
-           scheduleinterval="900"
-           buildfile="build-jboss-common.xml"
-           target="build-4.0-jdks"
-           timeout="7200"
-           logbuilddirectory="jboss-4.0.x"
-           testResults="checkout/jboss-4.0.x/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_4_0"
-           cvsmodule="jboss-4.0.x">
-  </project>
- --> 
-  <project template="projecttemplate.vm"
+
+  <project template="jbosslabstemplate.vm"
            name="jboss-4.0-testsuite-1.4"
            buildafterfailed="true"
            modificationset="jboss-4.0-testsuite-1.4"
-           tag="Branch_4_0"
 	   requiremodification="true"           
            time="2200"
            buildfile="build-jboss-common.xml"
@@ -126,16 +97,14 @@
            timeout="14400"
            logbuilddirectory="jboss-4.0-testsuite-1.4"
            testResults="checkout/jboss-4.0-testsuite-1.4/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_4_0"
-           cvsmodule="jboss-4.0.x"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
            jbossdir="jboss-4.0-testsuite-1.4">
   </project>
   
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-4.0-testsuite-1.5"
            buildafterfailed="true"
            modificationset="jboss-4.0-testsuite-1.5"
-           tag="Branch_4_0"
 	   requiremodification="true"           
            time="2200"
            buildfile="build-jboss-common.xml"
@@ -143,16 +112,14 @@
            timeout="14400"
            logbuilddirectory="jboss-4.0-testsuite-1.5"
            testResults="checkout/jboss-4.0-testsuite-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_4_0"
-           cvsmodule="jboss-4.0.x"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"           
            jbossdir="jboss-4.0-testsuite-1.5">
   </project>
   
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-4.0-testsuite-1.6"
            buildafterfailed="true"
            modificationset="jboss-4.0-testsuite-1.6"
-           tag="Branch_4_0"
 	   requiremodification="true"           
            time="2200"
            buildfile="build-jboss-common.xml"
@@ -160,26 +127,11 @@
            timeout="14400"
            logbuilddirectory="jboss-4.0-testsuite-1.6"
            testResults="checkout/jboss-4.0-testsuite-1.6/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_4_0"
-           cvsmodule="jboss-4.0.x"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
            jbossdir="jboss-4.0-testsuite-1.6">
   </project>  
-<!--    
-  <project template="projecttemplate.vm"
-           name="jboss-head-jdk-matrix"
-           modificationset="jboss-head"
-           requiremodification="true" 
-           scheduleinterval="900"
-           buildfile="build-jboss-common.xml"
-           target="build-head-jdks"
-           timeout="7200"
-           logbuilddirectory="jboss-head"
-           testResults="checkout/jboss-head/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           cvsmodule="jboss-head">
-  </project>
--->  
 
+<!--
   <project template="projecttemplate.vm"
            name="jboss-head-testsuite-1.4"
            buildafterfailed="true"
@@ -195,8 +147,8 @@
            cvsmodule="jboss-head"
            jbossdir="jboss-head-testsuite-1.4">
   </project>  
-  
-  <project template="projecttemplate.vm"
+-->  
+  <project template="jbosslabstemplate.vm"
            name="jboss-head-testsuite-1.5"
            buildafterfailed="true"
            modificationset="jboss-head-testsuite-1.5"
@@ -207,12 +159,11 @@
            timeout="14400"
            logbuilddirectory="jboss-head-testsuite-1.5"
            testResults="checkout/jboss-head-testsuite-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           cvsmodule="jboss-head"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"
            jbossdir="jboss-head-testsuite-1.5">
   </project>
   
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-head-testsuite-1.6"
            buildafterfailed="true"
            modificationset="jboss-head-testsuite-1.6"
@@ -223,8 +174,7 @@
            timeout="14400"
            logbuilddirectory="jboss-head-testsuite-1.6"
            testResults="checkout/jboss-head-testsuite-1.6/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           cvsmodule="jboss-head"
+	   svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"
            jbossdir="jboss-head-testsuite-1.6">
   </project>  
 
@@ -242,54 +192,8 @@
            emailAlwaysTo="tom.baeyens at jboss.com,qa at jboss.com">
   </project>   
   
-<!--
-  <project template="projecttemplate.vm"
-           name="jms-head-testsuite"
-           modificationset="jms-head-testsuite/jms"
-           requiremodification="false"
-           time="2200"
-           buildfile="build-jms-head-testsuite.xml"
-           target="copyresults"
-           timeout="7200"
-           logbuilddirectory="jms-head-testsuite"
-           testResults="checkout/jms-head-testsuite/jms/tests/output/reports/TESTS-TestSuites.xml"
-           emailFailureTo="ovidiu.feodorov at jboss.com,tim.fox at jboss.com,qa at jboss.com"
-           emailAlwaysTo="ovidiu.feodorov at jboss.com,tim.fox at jboss.com,qa at jboss.com">
-  </project>   
-  
-  <project template="projecttemplate.vm"
-           name="jboss-portal-2.4-testsuite"
-           modificationset="jboss-portal-2.4"
-           requiremodification="false"
-           time="2200"
-           buildfile="build-jboss-portal.xml"
-           target="getcode runtestsuite copyresults"
-           timeout="7200"
-           logbuilddirectory="jboss-portal-2.4"
-           testResults="checkout/jboss-portal-2.4/build/reports/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           cvsmodule="jboss-portal-2.4"
-           jbossdir="jboss-portal-2.4"
-           emailFailureTo="jboss-development at lists.jboss.org,qa at jboss.com">
-  </project>  
 
   <project template="projecttemplate.vm"
-           name="jboss-cache"
-           modificationset="jboss-cache"
-           requiremodification="true"
-           scheduleinterval="900"
-           buildfile="build-JBossCache.xml"
-           target="build"
-           timeout="3600"
-           logbuilddirectory="jboss-cache"
-           testResults="checkout/jboss-cache/output/reports/html/TESTS-TestSuites.xml"
-           cvsbranch="HEAD"
-           emailFailureTo="jboss-development at lists.jboss.org"
-           emailAlwaysTo="dev-jbosscache at jboss.com,qa at jboss.com"
-           jbossdir="jboss-cache">
-  </project>
--->
-  <project template="projecttemplate.vm"
            name="jboss-cache-testsuite"
            modificationset="jboss-cache-testsuite"
            requiremodification="false"
@@ -389,21 +293,8 @@
            emailFailureTo="qa-internal at jboss.com"
            emailAlwaysTo="dsicore at jboss.com">
   </project>
-<!--
-  <project template="projecttemplate.vm"
-           name="cruisecontrol"
-           modificationset="cruisecontrol"
-           requiremodification="true"
-           scheduleinterval="900"
-           buildfile="build-cruisecontrol.xml"
-           target="build"
-           timeout="3600"
-           logbuilddirectory="cruisecontrol"
-           emailFailureTo="qa-internal at jboss.com,rrajasekaran at jboss.com"
-           emailAlwaysTo="qa-internal at jboss.com,rrajasekaran at jboss.com">
-  </project>
--->
-  <project template="projecttemplate.vm"
+
+  <project template="jbosslabstemplate.vm"
            name="microcontainer-head-testsuite"
            modificationset="microcontainer-head-testsuite/container"
            modificationset1="microcontainer-head-testsuite/dependency"
@@ -414,7 +305,9 @@
            target="copyresults"
            timeout="7200"
            logbuilddirectory="microcontainer-head-testsuite"
-           testResults="checkout/microcontainer-head-testsuite/build/reports/TESTS-TestSuites.xml">
+           testResults="checkout/microcontainer-head-testsuite/build/reports/TESTS-TestSuites.xml"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/trunk"
+           jbossdir="microcontainer-head-testsuite">
   </project>
 
   <project template="projecttemplate.vm"
@@ -442,15 +335,14 @@
            timeout="3600"
            logbuilddirectory="committer-list"
            testResults="checkout/committer-list/output/reports/html/TESTS-TestSuites.xml"           
-           emailFailureTo="qa-internal at jboss.com,rrajasekaran at jboss.com"
-           emailAlwaysTo="qa-internal at jboss.com,rrajasekaran at jboss.com">
+           emailFailureTo="qa-internal at jboss.com,"
+           emailAlwaysTo="qa-internal at jboss.com">
   </project>
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-3.2-compatibility-matrix"
            buildafterfailed="true"
            modificationset="jboss-3.2-compatibility-matrix"
-           tag="Branch_3_2"
            requiremodification="false"
            time="2200"
            buildfile="build-jboss-common.xml"
@@ -458,16 +350,14 @@
            timeout="7200"
            logbuilddirectory="jboss-3.2-compatibility-matrix"
            testResults="checkout/jboss-3.2-compatibility-matrix/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="Branch_3_2"
-           cvsmodule="jboss-3.2.x"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_3_2"
            jbossdir="jboss-3.2-compatibility-matrix">
   </project>
 
-  <project template="projecttemplate.vm"
+  <project template="jbosslabstemplate.vm"
            name="jboss-4.0-compatibility-matrix"
            buildafterfailed="true"
            modificationset="jboss-4.0-compatibility-matrix"
-           tag="Branch_4_0"
            requiremodification="false"
            time="2200"
            buildfile="build-jboss-common.xml"
@@ -475,8 +365,7 @@
            timeout="7200"
            logbuilddirectory="jboss-4.0-compatibility-matrix"
            testResults="checkout/jboss-4.0-compatibility-matrix/testsuite/output/reports/TESTS-TestSuites.xml"
-           cvsbranch="JBoss_4_0_4_SP"
-           cvsmodule="jboss-4.0.x"
+           svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"	
            jbossdir="jboss-4.0-compatibility-matrix">
   </project>
   
@@ -507,23 +396,9 @@
            testResults="checkout/concurrent-testsuite/output/reports/TESTS-TestSuites.xml"
            jbossdir="concurrent-testsuite">
   </project>   
+
 <!--  
   <project template="projecttemplate.vm"
-           name="jbossws-testsuite"
-           buildafterfailed="true"
-           modificationset="jbossws-testsuite"
-           requiremodification="false"
-           time="2200"
-           buildfile="build-jbossws-testsuite.xml"
-           target="copyresults"
-           timeout="7200"
-           logbuilddirectory="jbossws-testsuite"
-           testResults="checkout/jbossws-testsuite/output/tests/reports/TESTS-TestSuites.xml"
-           jbossdir="jbossws-testsuite">
-  </project>  
--->
-<!--  
-  <project template="projecttemplate.vm"
            name="aop-head-testsuite"
            buildafterfailed="true"
            modificationset="aop-head-testsuite"

Modified: trunk/tools/etc/cruisecontrol/templates/projecttemplate.vm
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projecttemplate.vm	2006-07-30 02:09:36 UTC (rev 54898)
+++ trunk/tools/etc/cruisecontrol/templates/projecttemplate.vm	2006-07-30 02:54:09 UTC (rev 54899)
@@ -37,7 +37,7 @@
 			 uselogger="$project.getAttributeValue("uselogger")" usedebug="$project.getAttributeValue("usedebug")" timeout="$project.getAttributeValue("timeout")" antWorkingDir="scripts">
 			 #if( !($cvsbranch == "") ) <property name="cvs.branch" value="$cvsbranch"/> #end
 #if( !($cvsmodule == "")) <property name="cvs.module" value="$cvsmodule"/> #end
-#if( !($jbossdir == "")) <property name="jboss.dir" value="$jbossdir"/> #end			 
+#if( !($jbossdir == "")) <property name="jboss.dir" value="$jbossdir"/> #end		
 </ant>
 		</schedule>
 




More information about the jboss-cvs-commits mailing list