Author: alessio.soldano(a)jboss.com Date: 2010-07-05 10:37:26 -0400 (Mon, 05 Jul 2010) New Revision: 12574 Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml framework/trunk/hudson/jboss/bin/jbossws-qa.sh Log: [JBWS-3049] Run hudson test jobs against vanilla AS Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-05 11:20:29 UTC (rev 12573) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.0.1/config.xml 2010-07-05 14:37:26 UTC (rev 12574) @@ -14,12 +14,17 @@ JBOSS_TARGET=jboss501 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE&quot; +rm -rf $WORKSPACE/jboss-copy +cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy +export JBOSS_HOME=$JBOSS_INSTANCE + +ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_HOME&quot; + # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -30,26 +35,26 @@ ant $ENVIRONMENT deploy-jboss501 # 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 +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS + tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi # # build the testsuite # -cd $JBOSS_INSTANCE/../../../testsuite +cd $JBOSS_HOME/../../../testsuite ./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main # @@ -69,9 +74,11 @@ # # stop jbossas # -$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 +rm -rf $JBOSS_HOME +mv $WORKSPACE/jboss-copy $JBOSS_HOME </command> </hudson.tasks.Shell> </builders> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-05 11:20:29 UTC (rev 12573) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.1.0/config.xml 2010-07-05 14:37:26 UTC (rev 12574) @@ -14,12 +14,17 @@ JBOSS_TARGET=jboss510 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ -ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; +rm -rf $WORKSPACE/jboss-copy +cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy +export JBOSS_HOME=$JBOSS_INSTANCE + +ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_HOME&quot; + # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -30,26 +35,26 @@ ant $ENVIRONMENT deploy-jboss510 # 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 +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS + tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi # # build the testsuite # -cd $JBOSS_INSTANCE/../../../testsuite +cd $JBOSS_HOME/../../../testsuite ./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main # @@ -69,9 +74,11 @@ # # stop jbossas # -$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 +rm -rf $JBOSS_HOME +mv $WORKSPACE/jboss-copy $JBOSS_HOME </command> </hudson.tasks.Shell> </builders> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-05 11:20:29 UTC (rev 12573) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2010-07-05 14:37:26 UTC (rev 12574) @@ -14,12 +14,17 @@ JBOSS_TARGET=jboss600 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/target/(a)hudson.jboss600.build@ -ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE&quot; +rm -rf $WORKSPACE/jboss-copy +cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy +export JBOSS_HOME=$JBOSS_INSTANCE + +ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_HOME&quot; + # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -30,26 +35,26 @@ ant $ENVIRONMENT deploy-jboss600 # 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 +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS + tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi # # build the testsuite # -cd $JBOSS_INSTANCE/../../../testsuite +cd $JBOSS_HOME/../../../testsuite ./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main # @@ -69,9 +74,11 @@ # # stop jbossas # -$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 +rm -rf $JBOSS_HOME +mv $WORKSPACE/jboss-copy $JBOSS_HOME </command> </hudson.tasks.Shell> </builders> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 11:20:29 UTC (rev 12573) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2010-07-05 14:37:26 UTC (rev 12574) @@ -14,12 +14,17 @@ JBOSS_TARGET=jboss601 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ -ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_INSTANCE&quot; +rm -rf $WORKSPACE/jboss-copy +cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy +export JBOSS_HOME=$JBOSS_INSTANCE + +ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_HOME&quot; + # # stop jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop # # build and deploy @@ -30,26 +35,26 @@ ant $ENVIRONMENT deploy-jboss601 # 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 +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log # # start jbossas # -$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS # Was it successfully started? $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS + tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS exit 1 fi # # build the testsuite # -cd $JBOSS_INSTANCE/../../../testsuite +cd $JBOSS_HOME/../../../testsuite ./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main # @@ -69,9 +74,11 @@ # # stop jbossas # -$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 +rm -rf $JBOSS_HOME +mv $WORKSPACE/jboss-copy $JBOSS_HOME </command> </hudson.tasks.Shell> </builders> Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh =================================================================== --- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 11:20:29 UTC (rev 12573) +++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-07-05 14:37:26 UTC (rev 12574) @@ -18,21 +18,24 @@ exit -1; fi - ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE" - export JBOSS_HOME=$JBOSS_INSTANCE + rm -rf $WORKSPACE/jboss-as + cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as + export JBOSS_HOME=$WORKSPACE/jboss-as + + ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_HOME" } stopJBoss() { - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS } startJBoss() { - $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS } copyJBossLogs() { - cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log - cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log + cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log + cp $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log } copyTestLogs() { @@ -41,14 +44,14 @@ } removeJBossLogs() { - rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log - rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log + rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/boot.log + rm -f $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log } ensureRunningJBoss() { $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log + tail -n 100 $JBOSS_HOME/server/$JBOSS_CONFIG/log/server.log stopJBoss copyJBossLogs exit 1 @@ -126,6 +129,7 @@ } detectFailures() { + rm -rf $WORKSPACE/jboss-as cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log if [ -s $WORKSPACE/failure.log ]; then echo "Failure detected"