Author: alessio.soldano(a)jboss.com Date: 2010-12-22 10:09:22 -0500 (Wed, 22 Dec 2010) New Revision: 410 Added: hudson/trunk/hudson-home/jobs/AS-5.1.0/ hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml hudson/trunk/hudson-home/jobs/AS-6.0.0/ hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/ hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/ hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml Modified: hudson/trunk/ant.properties.example hudson/trunk/build.xml hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml Log: A bunch of changes/fixes/updates on hudson configuration: - upgraded to Hudson 1.226 / Tomcat 5.5.31 - added jobs for building and testing with AS 5.1.0 - added jobs for building and testing with AS 6.0.0.CR1 Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2010-12-22 12:37:18 UTC (rev 409) +++ hudson/trunk/ant.properties.example 2010-12-22 15:09:22 UTC (rev 410) @@ -29,9 +29,17 @@ hudson.jboss423.build=jboss-4.2.3.GA hudson.jboss423.rev=HEAD +hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA +hudson.jboss510.build=jboss-5.1.0.GA +hudson.jboss510.rev=HEAD + +hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.20101110-CR1 +hudson.jboss600.build=jboss-6.0.0.20101110-CR1 +hudson.jboss600.rev=HEAD + hudson.mail.recipients= hudson.smtp.host=localhost # Hudson setup -apache-tomcat=5.5.20 -sun-hudson=1.160 +apache-tomcat=5.5.31 +sun-hudson=1.226 Modified: hudson/trunk/build.xml =================================================================== --- hudson/trunk/build.xml 2010-12-22 12:37:18 UTC (rev 409) +++ hudson/trunk/build.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -62,7 +62,8 @@ --> <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <!-- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> --> + <get src="http://mirror.nohup.it/apache/tomcat/tomcat-5/v${apache-tomcat}/bin/apache-tomcat-${apache-tomcat}.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <mkdir dir="${hudson.root}"/> @@ -158,6 +159,7 @@ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <env key="HUDSON_HOME" value="${hudson.home}"/> <arg line="start"/> </exec> Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2010-12-22 12:37:18 UTC (rev 409) +++ hudson/trunk/hudson-home/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -12,6 +12,8 @@ <tr><th align=left>Wise-core:</th><td>@hudson.wise.core.url@</td></tr> <tr><td colspan=2></td></tr> <tr><th align=left&gt;@hudson.jboss423.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr> + <tr><th align=left&gt;@hudson.jboss510.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr> + <tr><th align=left&gt;@hudson.jboss600.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr> <tr><td colspan=2></td></tr> </table> ]]> @@ -28,6 +30,8 @@ <no-comparator/> <string>Wise-Core-AS-4.2.3-JDK5</string> <string>Wise-Core-AS-4.2.3-JDK6</string> + <string>Wise-Core-AS-5.1.0-JDK6</string> + <string>Wise-Core-AS-6.0.0-JDK6</string> </jobNames> <name>Core Tests</name> <description> @@ -49,6 +53,8 @@ <jobNames class="tree-set"> <no-comparator/> <string>AS-4.2.3</string> + <string>AS-5.1.0</string> + <string>AS-6.0.0</string> </jobNames> <name>Target Container</name> <description> <![CDATA[ Added: hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/AS-5.1.0/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -0,0 +1,70 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +SVNBASE=JBossAS-5.1.0 + +# +# checkout with an explicit version +# +#if [ -d "$SVNBASE" ]; then +# svn up -r(a)hudson.jboss510.rev@ $SVNBASE +#else +# svn co -r(a)hudson.jboss510.rev@ @hudson.jboss510.url@ +#fi + +# +# build jboss +# +cd $SVNBASE +#rm -rf thirdparty/* +./build/build.sh clean main + +# +# Verify build +# +if [ ! -d ./build/output/(a)hudson.jboss510.build@ ]; then + echo "Cannot find expected build: @hudson.jboss510.build@" + exit 1 +fi + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.jboss510.url(a)&lt;/remote&gt; + <local>JBossAS-5.1.0</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossAS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>7</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build AS-5.1.0</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/AS-6.0.0/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -0,0 +1,70 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +SVNBASE=JBossAS-6.0.0 + +# +# checkout with an explicit version +# +#if [ -d "$SVNBASE" ]; then +# svn up -r(a)hudson.jboss600.rev@ $SVNBASE +#else +# svn co -r(a)hudson.jboss600.rev@ @hudson.jboss600.url@ +#fi + +# +# build jboss +# +cd $SVNBASE +./build.sh clean +./build.sh -Dskip-download-sources + +# +# Verify build +# +if [ ! -d ./build/target/(a)hudson.jboss600.build@ ]; then + echo "Cannot find expected build: @hudson.jboss600.build@" + exit 1 +fi + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.jboss600.url(a)&lt;/remote&gt; + <local>JBossAS-6.0.0</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossAS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>7</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build AS-6.0.0</description> + <actions class="vector"/> +</project> Modified: hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml 2010-12-22 12:37:18 UTC (rev 409) +++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-4.2.3-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -15,7 +15,7 @@ JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed" +#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed" # # load test functions Added: hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-5.1.0-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -0,0 +1,92 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=Wise-Core-AS-5.1.0-JDK6 + +WORKSPACE=`pwd` +JAVA_HOME=(a)java.home.jdk16@ +HUDSON_DIR=$WORKSPACE/hudson +CORE_DIR=$WORKSPACE/core +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ +#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed" + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/wisecore-qa.sh + +# +# Copy endorsed libs +# +cp $JBOSS_INSTANCE/client/jaxb-api.jar $JBOSS_INSTANCE/lib/endorsed +cp $JBOSS_INSTANCE/client/jbossws-native-jaxrpc.jar $JBOSS_INSTANCE/lib/endorsed +cp $JBOSS_INSTANCE/client/jbossws-native-jaxws.jar $JBOSS_INSTANCE/lib/endorsed +cp $JBOSS_INSTANCE/client/jbossws-native-jaxws-ext.jar $JBOSS_INSTANCE/lib/endorsed +cp $JBOSS_INSTANCE/client/jbossws-native-saaj.jar $JBOSS_INSTANCE/lib/endorsed + +# +# execute core tests +# +coreTest + +# +# Remove endorsed libs +# +rm -f $JBOSS_INSTANCE/lib/endorsed/jaxb-api.jar +rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxrpc.jar +rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxws.jar +rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-jaxws-ext.jar +rm -f $JBOSS_INSTANCE/lib/endorsed/jbossws-native-saaj.jar + + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>core/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.hudson.url(a)&lt;/remote&gt; + <local>hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.wise.core.url(a)&lt;/remote&gt; + <local>core</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/Wise/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test wise-core-(a)version.id@ against AS-5.1.0 with JDK6</description> + <actions class="vector"/> +</project> Added: hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/Wise-Core-AS-6.0.0-JDK6/config.xml 2010-12-22 15:09:22 UTC (rev 410) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=Wise-Core-AS-6.0.0-JDK6 + +WORKSPACE=`pwd` +JAVA_HOME=(a)java.home.jdk16@ +HUDSON_DIR=$WORKSPACE/hudson +CORE_DIR=$WORKSPACE/core +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@ +#TEST_OPTS="-Dendorsed.dir=$JBOSS_INSTANCE/lib/endorsed -Dcxf.stack=true -Djboss6=true" +TEST_OPTS="-Dcxf.stack=true -Djboss6=true" + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/wisecore-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>core/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.hudson.url(a)&lt;/remote&gt; + <local>hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.wise.core.url(a)&lt;/remote&gt; + <local>core</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/Wise/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test wise-core-(a)version.id@ against AS-6.0.0 with JDK6</description> + <actions class="vector"/> +</project>