Author: heiko.braun(a)jboss.com
Date: 2007-05-31 09:32:36 -0400 (Thu, 31 May 2007)
New Revision: 3330
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/build/hudson/jboss/bin/jboss.sh
Log:
Improved AS start procedure
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-31 12:56:16 UTC
(rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-31 13:32:36 UTC
(rev 3330)
@@ -37,6 +37,13 @@
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# build the testsuite
#
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-31 12:56:16 UTC
(rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-31 13:32:36 UTC
(rev 3330)
@@ -37,6 +37,13 @@
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# build the testsuite
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -37,6 +37,13 @@
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -37,6 +37,13 @@
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-31 12:56:16
UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-31 13:32:36
UTC (rev 3330)
@@ -44,8 +44,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-31
12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-31
13:32:36 UTC (rev 3330)
@@ -36,8 +36,14 @@
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-sleep 60
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+if [ "$?" -eq 1 ]; then
+ echo "Failed to start jboss"
+ exit 1
+fi
+
#
# execute tests
#
Modified: trunk/build/hudson/jboss/bin/jboss.sh
===================================================================
--- trunk/build/hudson/jboss/bin/jboss.sh 2007-05-31 12:56:16 UTC (rev 3329)
+++ trunk/build/hudson/jboss/bin/jboss.sh 2007-05-31 13:32:36 UTC (rev 3330)
@@ -26,7 +26,6 @@
# It relies on bash specific features
# Do you want to hide jboss output?
/bin/bash $DIRNAME/runjboss.sh -b $BINDADDR &
- sleep 20
;;
stop)
pidfile="$JBOSS_HOME/bin/jboss.pid"
Show replies by date