[jboss-osgi-commits] JBoss-OSGI SVN: r88444 - in projects/jboss-osgi/trunk/build/hudson: hudson-home and 5 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri May 8 11:04:19 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-08 11:04:18 -0400 (Fri, 08 May 2009)
New Revision: 88444
Modified:
projects/jboss-osgi/trunk/build/hudson/
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
Log:
Refactor container startup - WIP
Property changes on: projects/jboss-osgi/trunk/build/hudson
___________________________________________________________________
Name: svn:mergeinfo
-
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 15:04:18 UTC (rev 88444)
@@ -9,7 +9,8 @@
OSGIDIR=$WORKSPACE/jboss-osgi
DISTRODIR=$OSGIDIR/build/distribution/target
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
case "$CONTAINER" in
'jboss501')
@@ -19,7 +20,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss510')
JBOSS_BUILD=jboss-5.1.0.GA
@@ -28,7 +29,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss600')
JBOSS_BUILD=jboss-6.0.0.Alpha1
@@ -37,7 +38,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'runtime')
RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
@@ -79,13 +80,13 @@
#
# start jbossas
#
-$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSONBIN/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
# Was it successfully started?
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $RUNTIME_LOG
- $HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
+ $HUDSONBIN/startup.sh $RUNTIME_HOME stop
exit 1
fi
@@ -100,7 +101,7 @@
#
# stop jbossas
#
-$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
+$HUDSONBIN/startup.sh $RUNTIME_HOME stop
#
# copy test.log to workspace
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -30,7 +30,8 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-5.1.0.GA
@@ -48,16 +49,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
+ $HUDSONBIN/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -30,7 +30,8 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-6.0.0.Alpha1
@@ -48,16 +49,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
+ $HUDSONBIN/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export JBOSS_BINDADDR=@jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export JBOSS_BINDADDR=@jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -60,7 +60,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export FRAMEWORK=$framework
export CONTAINER=$container
@@ -73,7 +73,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
More information about the jboss-osgi-commits
mailing list