Author: thomas.diesler(a)jboss.com Date: 2008-09-03 03:43:34 -0400 (Wed, 03 Sep 2008) New Revision: 2074 Added: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/ Removed: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/ Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml Log: Use command.sh from jbpm workspace Added: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh (rev 0) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 07:43:34 UTC (rev 2074) @@ -0,0 +1,74 @@ +#!/bin/sh + +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm +DISTRODIR=$JBPMDIR/modules/distribution/target + +case "$CONTAINER" in + jboss422*) + JBOSS_BUILD=jboss-4.2.2.GA + ;; + + jboss423*) + JBOSS_BUILD=jboss-4.2.3.GA + ;; + + jboss500*) + JBOSS_BUILD=jboss-5.0.0.CR1 + ;; +esac + +# +# Unzip the JBoss build +# +rm -rf $JBOSS_BUILD +unzip -q $HUDSON_ROOT/jboss/$JBOSS_BUILD.zip + +JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD +ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME" + +# +# Build distro +# +cd $JBPMDIR +cp profiles.xml.example profiles.xml +mvn -U -Pdistro clean package + +# +# Deploy distro +# +sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml +sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml +cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar auto-install.xml + +# +# start jbossas +# +$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR + +# Was it successfully started? +$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +if [ -e $WORKSPACE/spider.failed ]; then + tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log + $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR + exit 1 +fi + +# +# log dependency tree +# +mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt + +# +# execute tests +# +mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log +# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt +# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt + +# +# stop jbossas +# +$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop +cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log +cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log Property changes on: jbpm3/trunk/hudson/hudson-home/command.sh ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix (from rev 2073, jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix) Deleted: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh 2008-09-03 07:43:34 UTC (rev 2074) @@ -1,75 +0,0 @@ -#!/bin/sh - -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm -DISTRODIR=$JBPMDIR/modules/distribution/target -JBOSS_BINDADDR=(a)jboss.bind.address@ - -case "$CONTAINER" in - jboss422*) - JBOSS_BUILD=jboss-4.2.2.GA - ;; - - jboss423*) - JBOSS_BUILD=jboss-4.2.3.GA - ;; - - jboss500*) - JBOSS_BUILD=jboss-5.0.0.CR1 - ;; -esac - -# -# Unzip the JBoss build -# -rm -rf $JBOSS_BUILD -unzip -q @hudson.jboss(a)/$JBOSS_BUILD.zip - -JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD -ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME" - -# -# Build distro -# -cd $JBPMDIR -cp profiles.xml.example profiles.xml -mvn -U -Pdistro clean package - -# -# Deploy distro -# -sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml -sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml -cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml - -# -# start jbossas -# -$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR - -# Was it successfully started? -$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE -if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR - exit 1 -fi - -# -# log dependency tree -# -mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt - -# -# execute tests -# -mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log -# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt -# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt - -# -# stop jbossas -# -$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop -cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log -cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 07:43:34 UTC (rev 2074) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Matrix</description> + <description>Build and test the @version.id@ Container Matrix</description> <logRotator> <daysToKeep>28</daysToKeep> <numToKeep>-1</numToKeep> @@ -39,8 +39,6 @@ <name>database</name> <values> <string>hsqldb</string> - <string>mysql</string> - <string>postgresql</string> </values> </axis> <axis> @@ -54,13 +52,20 @@ <builders> <hudson.tasks.Shell> <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + export CONTAINER=$container export DATABASE=$database +export HUDSON_ROOT=(a)hudson.root@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +$JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> </builders> Copied: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix (from rev 2073, jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix) Deleted: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh 2008-09-03 07:43:34 UTC (rev 2074) @@ -1,75 +0,0 @@ -#!/bin/sh - -WORKSPACE=`pwd` -JBPMDIR=$WORKSPACE/jbpm -DISTRODIR=$JBPMDIR/modules/distribution/target -JBOSS_BINDADDR=(a)jboss.bind.address@ - -case "$CONTAINER" in - jboss422*) - JBOSS_BUILD=jboss-4.2.2.GA - ;; - - jboss423*) - JBOSS_BUILD=jboss-4.2.3.GA - ;; - - jboss500*) - JBOSS_BUILD=jboss-5.0.0.CR1 - ;; -esac - -# -# Unzip the JBoss build -# -rm -rf $JBOSS_BUILD -unzip -q @hudson.jboss(a)/$JBOSS_BUILD.zip - -JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD -ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME" - -# -# Build distro -# -cd $JBPMDIR -cp profiles.xml.example profiles.xml -mvn -U -Pdistro clean package - -# -# Deploy distro -# -sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml -sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml -cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml - -# -# start jbossas -# -$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR - -# Was it successfully started? -$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE -if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log - $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR - exit 1 -fi - -# -# log dependency tree -# -mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt - -# -# execute tests -# -mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log -# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt -# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt - -# -# stop jbossas -# -$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop -cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log -cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 07:43:34 UTC (rev 2074) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Matrix</description> + <description>Build and test the @version.id@ Database Matrix</description> <logRotator> <daysToKeep>28</daysToKeep> <numToKeep>-1</numToKeep> @@ -31,8 +31,6 @@ <name>container</name> <values> <string>jboss422</string> - <string>jboss423</string> - <string>jboss500</string> </values> </axis> <axis> @@ -54,13 +52,20 @@ <builders> <hudson.tasks.Shell> <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + export CONTAINER=$container export DATABASE=$database +export HUDSON_ROOT=(a)hudson.root@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +$JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> </builders> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:43:34 UTC (rev 2074) @@ -44,10 +44,18 @@ <builders> <hudson.tasks.Shell> <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + +export HUDSON_ROOT=(a)hudson.root@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ + # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +$JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> </builders> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:21:42 UTC (rev 2073) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:43:34 UTC (rev 2074) @@ -44,10 +44,18 @@ <builders> <hudson.tasks.Shell> <command> +WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm + +export HUDSON_ROOT=(a)hudson.root@ +export JBPM_VERSION=(a)version.id@ +export JBOSS_SERVER=(a)jboss.server.instance@ +export JBOSS_BINDADDR=(a)jboss.bind.address@ + # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +$JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> </builders>