[jbossws-commits] JBossWS SVN: r9511 - framework/trunk/hudson/jboss/bin.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 6 09:31:50 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-03-06 09:31:50 -0500 (Fri, 06 Mar 2009)
New Revision: 9511
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
[JBWS-2537] optimizing shared shell script
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-06 13:44:18 UTC (rev 9510)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-06 14:31:50 UTC (rev 9511)
@@ -1,240 +1,144 @@
#!/bin/sh
-coreTest() {
+ensureJavaExists() {
+ if [ ! -d $JAVA_HOME ]; then
+ echo "Please point java.home.jdkXY (ant.properties) to your JDK installation"
+ exit 1
+ fi
+}
-#
-# setup environment
-#
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
+setupEnv() {
+ ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
+}
-#
-# Verify JDK availablility
-#
-if [ ! -d $JAVA_HOME ]; then
- echo "Please point java.home.jdkXY (ant.properties) to your JDK installation"
- exit 1
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-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_CONFIG/log/boot.log
-rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
-
-#
-# start jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
-
-# Was it successfully started?
-$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
+stopJBoss() {
$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
- exit 1
-fi
+}
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+startJBoss() {
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+}
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+copyJBossLogs() {
+ cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log $WORKSPACE/jboss-boot.log
+ cp $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log $WORKSPACE/jboss-server.log
+}
-#
-# stop jbossas
-#
-$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
+copyTestLogs() {
+ cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+ cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+}
-#
-# detect failures
-#
-cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
-if [ -s $WORKSPACE/failure.log ]; then
- echo "Failure detected"
+removeJBossLogs() {
+ rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log
+ rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
+}
+
+ensureRunningJBoss() {
+ $FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+ if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
+ stopJBoss
+ copyJBossLogs
exit 1
-fi
+ fi
+}
+logMavenDependencies() {
+ mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
}
-binaryDistributionTest() {
+deployCoreDistribution() {
+ cd $STACK_DIR
+ cp profiles.xml.example profiles.xml
+ mvn -Ptestsuite clean
+ ant $ENVIRONMENT deploy-$JBOSS_TARGET
+}
-#
-# setup environment
-#
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
+deployBinaryDistribution() {
+ cd $STACK_DIR
+ cp profiles.xml.example profiles.xml
+ mvn -Ptestsuite clean
+ ant $ENVIRONMENT build-bin-dist
+ cd target
+ rm -rf jbossws-$STACK_ID-bin-dist
+ unzip jbossws-$STACK_ID-bin-dist.zip
+ cd jbossws-$STACK_ID-bin-dist
+ cp ant.properties.example ant.properties
+ ant $ENVIRONMENT deploy-$JBOSS_TARGET
+}
-#
-# Verify JDK availablility
-#
-if [ ! -d $JAVA_HOME ]; then
- echo "Please point java.home.jdkXY (ant.properties) to your JDK installation"
- exit 1
-fi
+deploySourceDistribution() {
+ cd $STACK_DIR
+ cp profiles.xml.example profiles.xml
+ mvn -Ptestsuite clean
+ ant $ENVIRONMENT build-src-dist
+ cd target
+ rm -rf jbossws-$STACK_ID-src-dist
+ unzip jbossws-$STACK_ID-src-dist.zip
+ cd jbossws-$STACK_ID-src-dist
+ ant $ENVIRONMENT deploy-$JBOSS_TARGET
+}
-#
-# stop jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACK_DIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-$STACK_ID-bin-dist
-unzip jbossws-$STACK_ID-bin-dist.zip
-cd jbossws-$STACK_ID-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-$JBOSS_TARGET
-
-# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log
-rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
-
-#
-# start jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
-
-# Was it successfully started?
-$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
- exit 1
-fi
-
-#
-# execute tests
-#
-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 $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$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
-#
-cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
-if [ -s $WORKSPACE/failure.log ]; then
+detectFailures() {
+ cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
+ if [ -s $WORKSPACE/failure.log ]; then
echo "Failure detected"
exit 1
-fi
+ fi
+}
+runTestsViaMaven() {
+ mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS test 2>&1 | tee $WORKSPACE/tests.log
}
-sourceDistributionTest() {
+runTestsViaAnt() {
+ ant $ENVIRONMENT tests-clean tests $TEST_OPTS 2>&1 | tee $WORKSPACE/tests.log
+}
-#
-# setup environment
-#
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
+coreTest() {
+ setupEnv
+ ensureJavaExists
+ stopJBoss
+ deployCoreDistribution
+ removeJBossLogs
+ startJBoss
+ ensureRunningJBoss
+ logMavenDependencies
+ runTestsViaMaven
+ copyTestLogs
+ stopJBoss
+ copyJBossLogs
+ detectFailures
+}
-#
-# Verify JDK availablility
-#
-if [ ! -d $JAVA_HOME ]; then
- echo "Please point java.home.jdkXY (ant.properties) to your JDK installation"
- exit 1
-fi
+binaryDistributionTest() {
+ setupEnv
+ ensureJavaExists
+ stopJBoss
+ deployBinaryDistribution
+ removeJBossLogs
+ startJBoss
+ ensureRunningJBoss
+ runTestsViaAnt
+ copyTestLogs
+ stopJBoss
+ copyJBossLogs
+ detectFailures
+}
-#
-# stop jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACK_DIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-$STACK_ID-src-dist
-unzip jbossws-$STACK_ID-src-dist.zip
-cd jbossws-$STACK_ID-src-dist
-ant $ENVIRONMENT deploy-$JBOSS_TARGET
-
-# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/boot.log
-rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
-
-#
-# start jbossas
-#
-$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
-
-# Was it successfully started?
-$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIG/log/server.log
- $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$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
-#
-cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
-if [ -s $WORKSPACE/failure.log ]; then
- echo "Failure detected"
- exit 1
-fi
-
+sourceDistributionTest() {
+ setupEnv
+ ensureJavaExists
+ stopJBoss
+ deploySourceDistribution
+ removeJBossLogs
+ startJBoss
+ ensureRunningJBoss
+ logMavenDependencies
+ runTestsViaMaven
+ copyTestLogs
+ stopJBoss
+ copyJBossLogs
+ detectFailures
}
More information about the jbossws-commits
mailing list