[jbossws-commits] JBossWS SVN: r9494 - in framework/trunk/hudson: hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6 and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Mar 5 08:47:53 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-03-05 08:47:53 -0500 (Thu, 05 Mar 2009)
New Revision: 9494
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/config.xml
framework/trunk/hudson/jboss/bin/jboss-qa.sh
Log:
[JBWS-2537] refactoring (WIP)
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3/config.xml 2009-03-05 13:32:58 UTC (rev 9493)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3/config.xml 2009-03-05 13:47:53 UTC (rev 9494)
@@ -9,79 +9,25 @@
MODULE=CXF-Source-Distro-AS-4.2.3
WORKSPACE=`pwd`
+JAVA_HOME=@java.home.jdk15@
FRAMEWORKDIR=$WORKSPACE/framework
STACKDIR=$WORKSPACE/stack-cxf
JBOSS_TARGET=jboss423
JBOSS_BINDADDR=@jboss.bind.address@
+JBOSS_CONFIGURATION=@jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/@hudson.jboss423.build@
ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE"
#
-# stop jbossas
+# load test functions
#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
+. $FRAMEWORKDIR/hudson/jboss/bin/jboss-qa.sh
#
-# Deploy distro
+# execute source distribution tests
#
-cd target
-rm -rf jbossws-cxf-src-dist
-unzip jbossws-cxf-src-dist.zip
-cd jbossws-cxf-src-dist
-ant $ENVIRONMENT deploy-jboss423
+sourceDistributionTest();
-# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance@/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log
-
-#
-# start jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance@/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log $WORKSPACE/jboss-server.log
-
-#
-# detect failures
-#
-cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
-if [ -s $WORKSPACE/failure.log ]; then
- echo "Failure detected"
- exit 1
-fi
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-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-05 13:32:58 UTC (rev 9493)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/config.xml 2009-03-05 13:47:53 UTC (rev 9494)
@@ -9,89 +9,25 @@
MODULE=CXF-Source-Distro-AS-4.2.3-JDK6
WORKSPACE=`pwd`
+JAVA_HOME=@java.home.jdk16@
FRAMEWORKDIR=$WORKSPACE/framework
STACKDIR=$WORKSPACE/stack-cxf
JBOSS_TARGET=jboss423
JBOSS_BINDADDR=@jboss.bind.address@
+JBOSS_CONFIGURATION=@jboss.server.instance@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/@hudson.jboss423.build@
ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE"
#
-# Verify JDK1.6 availablility
+# load test functions
#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
+. $FRAMEWORKDIR/hudson/jboss/bin/jboss-qa.sh
#
-# stop jbossas
+# execute source distribution tests
#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
+sourceDistributionTest();
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-cxf-src-dist
-unzip jbossws-cxf-src-dist.zip
-cd jbossws-cxf-src-dist
-ant $ENVIRONMENT deploy-jboss423
-
-# remove obsolete logs
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance@/log/boot.log
-rm -f $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log
-
-#
-# start jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance@/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance@/log/server.log $WORKSPACE/jboss-server.log
-
-#
-# detect failures
-#
-cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
-if [ -s $WORKSPACE/failure.log ]; then
- echo "Failure detected"
- exit 1
-fi
</command>
</hudson.tasks.Shell>
</builders>
Modified: framework/trunk/hudson/jboss/bin/jboss-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jboss-qa.sh 2009-03-05 13:32:58 UTC (rev 9493)
+++ framework/trunk/hudson/jboss/bin/jboss-qa.sh 2009-03-05 13:47:53 UTC (rev 9494)
@@ -104,8 +104,8 @@
ant $ENVIRONMENT deploy-jboss423
# 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_CONFIGURATION/log/boot.log
+rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log
#
# start jbossas
@@ -115,7 +115,7 @@
# Was it successfully started?
$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/JBOSS_CONFIGURATION/log/server.log
+ tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
@@ -131,8 +131,8 @@
# 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
+cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log $WORKSPACE/jboss-server.log
#
# detect failures
@@ -146,4 +146,80 @@
}
sourceDistributionTest() {
+
+#
+# Verify JDK availablility
+#
+if [ ! -d $JAVA_HOME ]; then
+ echo "Please point java.home.jdkXY (ant.properties) to your JDK installation"
+ exit 1
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-cxf-src-dist
+unzip jbossws-cxf-src-dist.zip
+cd jbossws-cxf-src-dist
+ant $ENVIRONMENT deploy-jboss500
+
+# remove obsolete logs
+rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/boot.log
+rm -f $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_INSTANCE/server/$JBOSS_CONFIGURATION/log/server.log $WORKSPACE/jboss-server.log
+
+#
+# detect failures
+#
+cat $WORKSPACE/tests.log | egrep "BUILD FAILURE" | tee $WORKSPACE/failure.log
+if [ -s $WORKSPACE/failure.log ]; then
+ echo "Failure detected"
+ exit 1
+fi
+
}
More information about the jbossws-commits
mailing list