[embjopr-commits] EMBJOPR SVN: r897 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2010-03-29 09:52:55 -0400 (Mon, 29 Mar 2010)
New Revision: 897

Modified:
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh
Log:
* hudson script: Added PROVIDE_WAR and it's stuff.

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh	2010-03-29 04:45:56 UTC (rev 896)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/testdata/hudson_shell_script.sh	2010-03-29 13:52:55 UTC (rev 897)
@@ -107,21 +107,34 @@
 
   mvn install -Dmaven.test.skip=true --update-snapshots
 
+
   cd jsfunit
     #  But get the latest testcases.
     rm pom.xml
     svn up
 
+    if [ -n "$PROVIDE_WAR" ] ; then
+       echo "Zipping the AS console war from '$JBOSS_HOME/server/all/admin-console.war' to $WORKSPACE/admin-console-DIST.war."
+       cd $JBOSS_HOME/server/all/admin-console.war
+       zip $WORKSPACE/admin-console-DIST.war *
+       PROVIDED_WAR=$WORKSPACE/admin-console-DIST.war
+    fi
+
+    if [ -n "$PROVIDED_WAR" ] ; then
+       echo "Provided WAR: $PROVIDED_WAR"
+       if [ ! -f "$PROVIDED_WAR" ] ; then echo "Provided WAR file does not exist: '$PROVIDED_WAR'"; exit -2; fi
+       PROVIDED_WAR=-Das.dist.war=$PROVIDED_WAR
+    fi
+
+    if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
+
     echo "Launching tests; binding JBoss AS to MYTESTIP_1 == $MYTESTIP_1"
     #echo -e "USER hudson hudson hudson hudson\nNICK HudsonBot\nJOIN #embjopr\nPRIVMSG #embjopr :`hostname`\nQUIT\n" |nc irc.devel.redhat.com 6667 || :
     echo `hostname`:4000 >> /tmp/embjopr-debug.log
 
-
-    if [ -n "$NO_GC_LIMIT" ] ; then ADD_PROFILES=",no_GC_limit"; fi
-
     if [ -n "$DONT_SPLIT" ] ; then
       echo "Running whole testsuite... (DONT_SPLIT)"
-      mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER  --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+      mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES $PROVIDED_WAR install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER  --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
     else
       ##  Include functions for Hudson.
       #. ~/config_repository/scripts/common/common_bash.sh
@@ -136,7 +149,7 @@
         echo "Killing JBoss AS..."
         killJBossAS
         rm -rf target/jboss5x # Empty Cargo's configuration dir
-        mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES verify -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
+        mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES $PROVIDED_WAR verify -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1
         #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml
         #mv target target-$part
         ls -l