[jbossws-commits] JBossWS SVN: r9493 - in framework/trunk/hudson: hudson-home/jobs/CXF-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:32:59 EST 2009 

Author: richard.opalka at jboss.com
Date: 2009-03-05 08:32:58 -0500 (Thu, 05 Mar 2009)
New Revision: 9493

Modified:
   framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3-JDK6/config.xml
   framework/trunk/hudson/hudson-home/jobs/CXF-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-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml	2009-03-05 13:20:35 UTC (rev 9492)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml	2009-03-05 13:32:58 UTC (rev 9493)
@@ -9,75 +9,25 @@
 MODULE=CXF-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-bin-dist
+. $FRAMEWORKDIR/hudson/jboss/bin/jboss-qa.sh
 
 #
-# Deploy distro
+# execute binary distribution tests
 #
-cd target
-rm -rf jbossws-cxf-bin-dist
-unzip jbossws-cxf-bin-dist.zip
-cd jbossws-cxf-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-jboss423
+binaryDistributionTest();
 
-# 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
-
-#
-# 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 $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-Distro-AS-4.2.3-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3-JDK6/config.xml	2009-03-05 13:20:35 UTC (rev 9492)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3-JDK6/config.xml	2009-03-05 13:32:58 UTC (rev 9493)
@@ -9,85 +9,25 @@
 MODULE=CXF-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=&quot;-Dmaven.opts=-U -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot;
 
 #
-# 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 binary 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-bin-dist
+binaryDistributionTest();
 
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-cxf-bin-dist
-unzip jbossws-cxf-bin-dist.zip
-cd jbossws-cxf-bin-dist
-cp ant.properties.example ant.properties
-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
-
-#
-# execute tests
-#
-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
-
-#
-# 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:20:35 UTC (rev 9492)
+++ framework/trunk/hudson/jboss/bin/jboss-qa.sh	2009-03-05 13:32:58 UTC (rev 9493)
@@ -71,6 +71,78 @@
 }
 
 binaryDistributionTest() {
+
+#
+# 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-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-cxf-bin-dist
+unzip jbossws-cxf-bin-dist.zip
+cd jbossws-cxf-bin-dist
+cp ant.properties.example ant.properties
+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
+
+#
+# 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
+
+#
+# execute tests
+#
+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
+
+#
+# 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
+
 }
 
 sourceDistributionTest() {

More information about the jbossws-commits mailing list