[jboss-cvs] JBossAS SVN: r58356 - in trunk/tools/etc/cruisecontrol: scripts templates
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 14 16:17:59 EST 2006
Author: akostadinov
Date: 2006-11-14 16:17:56 -0500 (Tue, 14 Nov 2006)
New Revision: 58356
Modified:
trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml
trunk/tools/etc/cruisecontrol/templates/projects-solaris.xml
trunk/tools/etc/cruisecontrol/templates/projects.xml
Log:
re-target jboss-4.0 builds to 4.2
Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml 2006-11-14 21:05:55 UTC (rev 58355)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-common.xml 2006-11-14 21:17:56 UTC (rev 58356)
@@ -32,12 +32,12 @@
<sequential>
<exec dir="." executable="bash">
<arg value="-c"/>
- <arg value="ps -eaf --columns 1200 | grep run.jar | grep -v grep | awk '{ print $$2; }' | xargs kill"/>
+ <arg value="COLUMNS=1200 ps -eaf | grep run.jar | grep -v grep | awk '{ print $$2; }' | xargs kill"/>
</exec>
<sleep seconds="10"/>
<exec dir="." executable="bash">
<arg value="-c"/>
- <arg value="ps -eaf --columns 1200 | grep run.jar | grep -v grep | awk '{ print $$2; }' | xargs kill -9"/>
+ <arg value="COLUMNS=1200 ps -eaf | grep run.jar | grep -v grep | awk '{ print $$2; }' | xargs kill -9"/>
</exec>
</sequential>
</macrodef>
@@ -171,11 +171,13 @@
<attribute name="logName" default="tests.log"/>
<sequential>
<kill-jboss-dead/>
- <property name="jboss.versions.dir" value="/home/cruisecontrol/work/checkout/jboss-versions/"/>
+ <property name="jboss.versions.dir" value="../checkout/jboss-versions/"/>
+ <!-- <property name="jboss.versions.dir" value="/home/test_cc/work/checkout/jboss-versions/"/> -->
<delete>
<fileset dir="${jboss.versions.dir}">
<include name="3_2_x"/>
<include name="4_0_x"/>
+ <include name="4_2_x"/>
</fileset>
</delete>
<copy todir="${jboss.versions.dir}/3_2_x" flatten="true">
@@ -188,6 +190,11 @@
<include name="*/client/*.jar"/>
</fileset>
</copy>
+ <copy todir="${jboss.versions.dir}/4_2_x" flatten="true">
+ <fileset dir="../checkout/jboss-4.2.x/build/output">
+ <include name="*/client/*.jar"/>
+ </fileset>
+ </copy>
<exec executable="ant" dir="../checkout/${jboss.dir}/testsuite"
failonerror="false" resultproperty="tests.returncode"
@@ -270,6 +277,7 @@
<target name="copy-builds">
<property name="jboss-3.2.x-version" value="${3.x-version}"/>
<property name="jboss-4.0.x-version" value="${4.x-version}"/>
+ <property name="jboss-4.2.x-version" value="${4.2.x-version}"/>
<property name="jboss-head-version" value="${5.x-version}"/>
<propertycopy name="jboss.version" from="${jboss.dir}-version"/>
@@ -285,14 +293,15 @@
<target name="build-testsuite" depends="checkout">
<property name="jboss-3.2-testsuite-jdk" value="${java14}"/>
<property name="jboss-4.0.4.SP-testsuite-jdk" value="${jdk142}"/>
- <property name="jboss-4.0-testsuite-1.4-jdk" value="${bea-jdk14}"/>
- <property name="jboss-4.0-testsuite-1.5-jdk" value="${bea-jdk15}"/>
- <property name="jboss-4.0-testsuite-sun-1.4-jdk" value="${java14}"/>
- <property name="jboss-4.0-testsuite-sun-1.5-jdk" value="${java15}"/>
- <property name="jboss-4.0-testsuite-sun-1.4-solaris-jdk" value="${sun-jdk14-solaris}"/>
- <property name="jboss-4.0-testsuite-1.6-jdk" value="${jdk16}"/>
+ <property name="jboss-4.2-testsuite-1.4-jdk" value="${bea-jdk14}"/>
+ <property name="jboss-4.2-testsuite-1.5-jdk" value="${bea-jdk15}"/>
+ <property name="jboss-4.2-testsuite-sun-1.4-jdk" value="${java14}"/>
+ <property name="jboss-4.2-testsuite-sun-1.5-jdk" value="${java15}"/>
+ <property name="jboss-4.2-testsuite-sun-1.4-solaris-jdk" value="${sun-jdk14-solaris}"/>
+ <property name="jboss-4.2-testsuite-1.6-jdk" value="${jdk16}"/>
<property name="jboss-3.2-compatibility-matrix-jdk" value="${bea-jdk14}"/>
<property name="jboss-4.0-compatibility-matrix-jdk" value="${bea-jdk14}"/>
+ <property name="jboss-4.2-compatibility-matrix-jdk" value="${bea-jdk14}"/>
<property name="jboss-head-testsuite-1.4-jdk" value="${bea-jdk14}"/>
<property name="jboss-head-testsuite-1.5-jdk" value="${bea-jdk15}"/>
<property name="jboss-head-testsuite-1.6-jdk" value="${jdk16}"/>
@@ -301,14 +310,15 @@
<property name="jboss-3.2-testsuite-jdk-version" value="1.4"/>
<property name="jboss-4.0.4.SP-testsuite-jdk-version" value="1.4"/>
- <property name="jboss-4.0-testsuite-1.4-jdk-version" value="1.4"/>
- <property name="jboss-4.0-testsuite-1.5-jdk-version" value="1.5"/>
- <property name="jboss-4.0-testsuite-sun-1.4-jdk-version" value="1.4"/>
- <property name="jboss-4.0-testsuite-sun-1.5-jdk-version" value="1.5"/>
- <property name="jboss-4.0-testsuite-sun-1.4-solaris-jdk-version" value="1.4"/>
- <property name="jboss-4.0-testsuite-1.6-jdk-version" value="1.5"/>
+ <property name="jboss-4.2-testsuite-1.4-jdk-version" value="1.4"/>
+ <property name="jboss-4.2-testsuite-1.5-jdk-version" value="1.5"/>
+ <property name="jboss-4.2-testsuite-sun-1.4-jdk-version" value="1.4"/>
+ <property name="jboss-4.2-testsuite-sun-1.5-jdk-version" value="1.5"/>
+ <property name="jboss-4.2-testsuite-sun-1.4-solaris-jdk-version" value="1.4"/>
+ <property name="jboss-4.2-testsuite-1.6-jdk-version" value="1.5"/>
<property name="jboss-3.2-compatibility-matrix-jdk-version" value="1.4"/>
<property name="jboss-4.0-compatibility-matrix-jdk-version" value="1.4"/>
+ <property name="jboss-4.2-compatibility-matrix-jdk-version" value="1.4"/>
<property name="jboss-head-testsuite-1.4-jdk-version" value="1.4"/>
<property name="jboss-head-testsuite-1.5-jdk-version" value="1.5"/>
<property name="jboss-head-testsuite-1.6-jdk-version" value="1.6"/>
@@ -324,6 +334,9 @@
<build javaHomeDir="${jdk15}" logName="${jdk15.log}"/>
<antcall target="copy-builds"/>
</target>
+ <target name="build-4.2-jdks" depends="build">
+ <build javaHomeDir="${jdk15}" logName="${jdk15.log}"/>
+ </target>
<target name="build-4.0-jdks" depends="build">
<build javaHomeDir="${jdk15}" logName="${jdk15.log}"/>
</target>
Modified: trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties 2006-11-14 21:05:55 UTC (rev 58355)
+++ trunk/tools/etc/cruisecontrol/scripts/cruisecontrol.properties 2006-11-14 21:17:56 UTC (rev 58356)
@@ -5,6 +5,7 @@
3.x-version=3.2.8.SP2
4.x-version=4.0.5.SP1
+4.2.x-version=4.2.0.CR1
5.x-version=5.0.0.Beta
java15=/opt/jdk1.5.0_05
@@ -17,4 +18,4 @@
bea-jdk15=/opt/jrockit-jdk1.5.0_06
ant-ws=/opt/apache-ant-1.6.5-ws
-ant-jbpm=/home/cruisecontrol/apache-ant-1.6.5
\ No newline at end of file
+ant-jbpm=/home/cruisecontrol/apache-ant-1.6.5
Modified: trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml 2006-11-14 21:05:55 UTC (rev 58355)
+++ trunk/tools/etc/cruisecontrol/templates/projects-matrix.xml 2006-11-14 21:17:56 UTC (rev 58356)
@@ -69,7 +69,21 @@
jbossdir="jboss-4.0.x">
</project>
+ <project template="jbosslabstemplate.vm"
+ name="jboss-4.2-jdk-matrix"
+ modificationset="jboss-4.2.x"
+ requiremodification="true"
+ scheduleinterval="900"
+ buildfile="build-jboss-common.xml"
+ target="build-4.2-jdks"
+ timeout="7200"
+ logbuilddirectory="jboss-4.2.x"
+ testResults="checkout/jboss-4.2.x/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2.x">
+ </project>
+
<project template="jbosslabstemplate.vm"
name="jboss-head-jdk-matrix"
modificationset="jboss-head"
Modified: trunk/tools/etc/cruisecontrol/templates/projects-solaris.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects-solaris.xml 2006-11-14 21:05:55 UTC (rev 58355)
+++ trunk/tools/etc/cruisecontrol/templates/projects-solaris.xml 2006-11-14 21:17:56 UTC (rev 58356)
@@ -40,18 +40,19 @@
</testattributes>
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-sun-1.4-solaris"
+ name="jboss-4.2-testsuite-sun-1.4-solaris"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-sun-1.4-solaris"
+ modificationset="jboss-4.2-testsuite-sun-1.4-solaris"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="36000"
- logbuilddirectory="jboss-4.0-testsuite-sun-1.4-solaris"
- testResults="checkout/jboss-4.0-testsuite-sun-1.4-solaris/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-sun-1.4-solaris">
+ logbuilddirectory="jboss-4.2-testsuite-sun-1.4-solaris"
+ testResults="checkout/jboss-4.2-testsuite-sun-1.4-solaris/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-sun-1.4-solaris">
</project>
+
</projects>
Modified: trunk/tools/etc/cruisecontrol/templates/projects.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/templates/projects.xml 2006-11-14 21:05:55 UTC (rev 58355)
+++ trunk/tools/etc/cruisecontrol/templates/projects.xml 2006-11-14 21:17:56 UTC (rev 58356)
@@ -35,23 +35,23 @@
<testattributes testMode="no"
skipusers="true"
emailFrom="qa at jboss.com"
- emailFailureTo="rrajasekaran at jboss.com"
- emailAlwaysTo="rrajasekaran at jboss.com">
+ emailFailureTo="akostadinov at jboss.com"
+ emailAlwaysTo="akostadinov at jboss.com">
</testattributes>
<project template="jbosslabstemplate.vm"
- name="ejb3-4.0-testsuite"
- modificationset="ejb3-4.0-testsuite/ejb3"
+ name="ejb3-4.2-testsuite"
+ modificationset="ejb3-4.2-testsuite/ejb3"
requiremodification="false"
time="2200"
- buildfile="build-ejb3-4.0-testsuite.xml"
+ buildfile="build-ejb3-4.2-testsuite.xml"
target="copyresults"
timeout="7200"
- logbuilddirectory="ejb3-4.0-testsuite"
- 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">
+ logbuilddirectory="ejb3-4.2-testsuite"
+ testResults="checkout/ejb3-4.2-testsuite/ejb3/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="ejb3-4.2-testsuite">
</project>
@@ -87,78 +87,78 @@
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-1.4"
+ name="jboss-4.2-testsuite-1.4"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-1.4"
+ modificationset="jboss-4.2-testsuite-1.4"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="21600"
- logbuilddirectory="jboss-4.0-testsuite-1.4"
- testResults="checkout/jboss-4.0-testsuite-1.4/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-1.4">
+ logbuilddirectory="jboss-4.2-testsuite-1.4"
+ testResults="checkout/jboss-4.2-testsuite-1.4/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-1.4">
</project>
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-sun-1.4"
+ name="jboss-4.2-testsuite-sun-1.4"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-sun-1.4"
+ modificationset="jboss-4.2-testsuite-sun-1.4"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="21600"
- logbuilddirectory="jboss-4.0-testsuite-sun-1.4"
- testResults="checkout/jboss-4.0-testsuite-sun-1.4/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-sun-1.4">
+ logbuilddirectory="jboss-4.2-testsuite-sun-1.4"
+ testResults="checkout/jboss-4.2-testsuite-sun-1.4/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-sun-1.4">
</project>
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-1.5"
+ name="jboss-4.2-testsuite-1.5"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-1.5"
+ modificationset="jboss-4.2-testsuite-1.5"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="21600"
- logbuilddirectory="jboss-4.0-testsuite-1.5"
- testResults="checkout/jboss-4.0-testsuite-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-1.5">
+ logbuilddirectory="jboss-4.2-testsuite-1.5"
+ testResults="checkout/jboss-4.2-testsuite-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-1.5">
</project>
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-sun-1.5"
+ name="jboss-4.2-testsuite-sun-1.5"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-sun-1.5"
+ modificationset="jboss-4.2-testsuite-sun-1.5"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="21600"
- logbuilddirectory="jboss-4.0-testsuite-sun-1.5"
- testResults="checkout/jboss-4.0-testsuite-sun-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-sun-1.5">
+ logbuilddirectory="jboss-4.2-testsuite-sun-1.5"
+ testResults="checkout/jboss-4.2-testsuite-sun-1.5/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-sun-1.5">
</project>
<project template="jbosslabstemplate.vm"
- name="jboss-4.0-testsuite-1.6"
+ name="jboss-4.2-testsuite-1.6"
buildafterfailed="true"
- modificationset="jboss-4.0-testsuite-1.6"
+ modificationset="jboss-4.2-testsuite-1.6"
requiremodification="true"
time="2200"
buildfile="build-jboss-common.xml"
target="test copyresults"
timeout="21600"
- logbuilddirectory="jboss-4.0-testsuite-1.6"
- testResults="checkout/jboss-4.0-testsuite-1.6/testsuite/output/reports/TESTS-TestSuites.xml"
- svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
- jbossdir="jboss-4.0-testsuite-1.6">
+ logbuilddirectory="jboss-4.2-testsuite-1.6"
+ testResults="checkout/jboss-4.2-testsuite-1.6/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-testsuite-1.6">
</project>
<!--
@@ -423,6 +423,21 @@
svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_0"
jbossdir="jboss-4.0-compatibility-matrix">
</project>
+
+ <project template="jbosslabstemplate.vm"
+ name="jboss-4.2-compatibility-matrix"
+ buildafterfailed="true"
+ modificationset="jboss-4.2-compatibility-matrix"
+ requiremodification="false"
+ time="2200"
+ buildfile="build-jboss-common.xml"
+ target="test-compatibility copyresults"
+ timeout="7200"
+ logbuilddirectory="jboss-4.2-compatibility-matrix"
+ testResults="checkout/jboss-4.2-compatibility-matrix/testsuite/output/reports/TESTS-TestSuites.xml"
+ svnurl="http://anonsvn.jboss.org/repos/jbossas/branches/Branch_4_2"
+ jbossdir="jboss-4.2-compatibility-matrix">
+ </project>
<project template="projecttemplate.vm"
name="jbossretro-testsuite"
More information about the jboss-cvs-commits
mailing list