Author: richard.opalka(a)jboss.com Date: 2009-03-05 08:20:35 -0500 (Thu, 05 Mar 2009) New Revision: 9492 Added: framework/trunk/hudson/jboss/bin/jboss-qa.sh Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml Log: [JBWS-2537] refactoring (WIP) Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2009-03-05 10:24:58 UTC (rev 9491) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2009-03-05 13:20:35 UTC (rev 9492) @@ -9,70 +9,25 @@ MODULE=CXF-Core-AS-4.2.3 WORKSPACE=`pwd` +JAVA_HOME=(a)java.home.jdk15@ FRAMEWORKDIR=$WORKSPACE/framework STACKDIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ +JBOSS_CONFIGURATION=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # -# stop jbossas +# load test functions # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop - -# -# build and deploy -# -cd $STACKDIR -cp profiles.xml.example profiles.xml -mvn -Ptestsuite clean -ant $ENVIRONMENT deploy-jboss423 +. $FRAMEWORKDIR/hudson/jboss/bin/jboss-qa.sh -# remove obsolete logs -rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log -rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - # -# start jbossas +# execute core tests # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +coreTest(); -# Was it successfully started? -$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE -if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR - exit 1 -fi - -# -# log dependency tree -# -mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt - -# -# execute tests -# -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&amp;1 | tee $WORKSPACE/tests.log -cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt -cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt - -# -# stop jbossas -# -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop -cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log -cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log - -# -# detect failures -# -cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log -if [ -s $WORKSPACE/failure.log ]; then - echo "Failure detected" - exit 1 -fi </command> </hudson.tasks.Shell> </builders> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml 2009-03-05 10:24:58 UTC (rev 9491) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml 2009-03-05 13:20:35 UTC (rev 9492) @@ -9,80 +9,25 @@ MODULE=CXF-Core-AS-4.2.3-JDK6 WORKSPACE=`pwd` +JAVA_HOME=(a)java.home.jdk16@ FRAMEWORKDIR=$WORKSPACE/framework STACKDIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ +JBOSS_CONFIGURATION=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # -# Verify JDK1.6 availablility +# load test functions # -if [ "java.home.jdk16" = &quot;@java.home.jdk16(a)&quot; ]; then - echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation" - exit 1 -else - JAVA_HOME=&quot;@java.home.jdk16(a)&quot; -fi +. $FRAMEWORKDIR/hudson/jboss/bin/jboss-qa.sh # -# stop jbossas +# execute core tests # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop - -# -# build and deploy -# -cd $STACKDIR -cp profiles.xml.example profiles.xml -mvn -Ptestsuite clean -ant $ENVIRONMENT deploy-jboss423 +coreTest(); -# remove obsolete logs -rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log -rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - -# -# start jbossas -# -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR - -# Was it successfully started? -$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE -if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR - exit 1 -fi - -# -# log dependency tree -# -mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt - -# -# execute tests -# -mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&amp;1 | tee $WORKSPACE/tests.log -cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt -cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt - -# -# stop jbossas -# -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop -cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log -cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log - -# -# detect failures -# -cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log -if [ -s $WORKSPACE/failure.log ]; then - echo "Failure detected" - exit 1 -fi </command> </hudson.tasks.Shell> </builders> Added: framework/trunk/hudson/jboss/bin/jboss-qa.sh =================================================================== --- framework/trunk/hudson/jboss/bin/jboss-qa.sh (rev 0) +++ framework/trunk/hudson/jboss/bin/jboss-qa.sh 2009-03-05 13:20:35 UTC (rev 9492) @@ -0,0 +1,77 @@ +#!/bin/sh + +coreTest() { + +# +# Verify JDK availablility +# +if [ ! -d $JAVA_HOME ]; then + echo "Please point java.home.jdkXY (ant.properties) to your JDK installation" + exit 1 +fi + +# +# stop jbossas +# +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# build and deploy +# +cd $STACKDIR +cp profiles.xml.example profiles.xml +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-$JBOSS_TARGET + +# remove obsolete logs +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/boot.log +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log + +# +# start jbossas +# +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR + +# Was it successfully started? +$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +if [ -e $WORKSPACE/spider.failed ]; then + tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + exit 1 +fi + +# +# log dependency tree +# +mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt + +# +# execute tests +# +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&amp;1 | tee $WORKSPACE/tests.log +cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt +cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt + +# +# stop jbossas +# +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/boot.log $WORKSPACE/jboss-boot.log +cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log $WORKSPACE/jboss-server.log + +# +# detect failures +# +cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log +if [ -s $WORKSPACE/failure.log ]; then + echo "Failure detected" + exit 1 +fi + +} + +binaryDistributionTest() { +} + +sourceDistributionTest() { +} Property changes on: framework/trunk/hudson/jboss/bin/jboss-qa.sh ___________________________________________________________________ Name: svn:executable + *