Author: richard.opalka(a)jboss.com Date: 2009-03-06 02:52:06 -0500 (Fri, 06 Mar 2009) New Revision: 9504 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 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/CXF-Binary-Distro-AS-4.2.3-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK5/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml framework/trunk/hudson/jboss/bin/jbossws-qa.sh Log: [JBWS-2537] refactoring shell variable names to be consistent Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=AS-Tests-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss423 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +57,7 @@ # ./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 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 +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt # # copy the test reports @@ -69,7 +69,7 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$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 </command> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=AS-Tests-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss500 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +57,7 @@ # ./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 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 +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt # # copy the test reports @@ -69,7 +69,7 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$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 </command> 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 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=AS-Tests-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss501 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +57,7 @@ # ./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 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 +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt # # copy the test reports @@ -69,7 +69,7 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$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 </command> 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 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=AS-Tests-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss510 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +57,7 @@ # ./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 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 +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt # # copy the test reports @@ -69,7 +69,7 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$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 </command> 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 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=AS-Tests-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss600 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +57,7 @@ # ./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 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 +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt # # copy the test reports @@ -69,7 +69,7 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$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 </command> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute binary distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests 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-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute core tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ 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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +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@ ENVIRONMENT=&quot;-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.home=$JBOSS_INSTANCE&quot; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK5/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK5/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK5/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk15@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -10,18 +10,18 @@ WORKSPACE=`pwd` JAVA_HOME=(a)java.home.jdk16@ -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-cxf JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_CONFIGURATION=(a)jboss.server.instance@ +JBOSS_CONFIG=(a)jboss.server.instance@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(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; # # load test functions # -. $FRAMEWORKDIR/hudson/jboss/bin/jbossws-qa.sh +. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh # # execute source distribution tests Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss423 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss423 @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss500 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss500 @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss501 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss501 @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss510 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss510 @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss600 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Core-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss600 @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Distro-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -45,13 +45,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -65,12 +65,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -55,13 +55,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -75,12 +75,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -45,13 +45,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -65,12 +65,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -55,13 +55,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -75,12 +75,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -45,13 +45,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -65,12 +65,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -55,13 +55,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -75,12 +75,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -45,13 +45,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -65,12 +65,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -55,13 +55,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -75,12 +75,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -45,13 +45,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -65,12 +65,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Metro-Source-Distro-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-metro JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -55,13 +55,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -75,12 +75,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss423 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -34,12 +34,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss423 @@ -51,13 +51,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss500 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -34,12 +34,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss500 @@ -51,13 +51,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss501 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -34,12 +34,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss501 @@ -51,13 +51,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss510 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -34,12 +34,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss510 @@ -51,13 +51,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss600 @@ -36,13 +36,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,12 +56,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Core-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -34,12 +34,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT deploy-jboss600 @@ -51,13 +51,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,12 +61,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Distro-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -71,12 +71,12 @@ # ant $ENVIRONMENT tests-clean tests 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-4.2.3 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-4.2.3-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -76,12 +76,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -76,12 +76,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.0.1 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.0.1-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -76,12 +76,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.1.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-5.1.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss510 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -76,12 +76,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-6.0.0 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -19,12 +19,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -46,13 +46,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -66,12 +66,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-03-06 07:52:06 UTC (rev 9504) @@ -9,8 +9,8 @@ MODULE=Native-Source-Distro-AS-6.0.0-JDK6 WORKSPACE=`pwd` -FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +FRAMEWORK_DIR=$WORKSPACE/framework +STACK_DIR=$WORKSPACE/stack-native JBOSS_TARGET=jboss600 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@ @@ -29,12 +29,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -56,13 +56,13 @@ # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -76,12 +76,12 @@ # 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 +cat $STACK_DIR/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 +$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 Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh =================================================================== --- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-06 07:38:31 UTC (rev 9503) +++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-06 07:52:06 UTC (rev 9504) @@ -13,30 +13,30 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build and deploy # -cd $STACKDIR +cd $STACK_DIR 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 +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -50,14 +50,14 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $STACK_OPTS test 2>&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 +cat $STACK_DIR/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 +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +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 # # detect failures @@ -83,12 +83,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-bin-dist @@ -104,19 +104,19 @@ 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 +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -125,14 +125,14 @@ # ant $ENVIRONMENT tests-clean tests 2>&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 +cat $STACK_DIR/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 +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +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 # # detect failures @@ -158,12 +158,12 @@ # # stop jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $STACKDIR +cd $STACK_DIR cp profiles.xml.example profiles.xml mvn -Ptestsuite clean ant $ENVIRONMENT build-src-dist @@ -178,19 +178,19 @@ 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 +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log +rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log # # start jbossas # -$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORK_DIR/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 +$FRAMEWORK_DIR/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 + tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log + $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -204,14 +204,14 @@ # mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&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 +cat $STACK_DIR/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 +$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +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 # # detect failures