[jboss-osgi-commits] JBoss-OSGI SVN: r88443 - in projects/jboss-osgi/trunk/build/hudson/hudson-home: jobs/JBoss-5.1.0 and 4 other directories.

jboss-osgi-commits at lists.jboss.org jboss-osgi-commits at lists.jboss.org
Fri May 8 10:54:31 EDT 2009 

Author: thomas.diesler at jboss.com
Date: 2009-05-08 10:54:31 -0400 (Fri, 08 May 2009)
New Revision: 88443

Modified:
   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

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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-05-08 14:54:31 UTC (rev 88443)
@@ -9,7 +9,7 @@
 
 OSGIDIR=$WORKSPACE/jboss-osgi
 DISTRODIR=$OSGIDIR/build/distribution/target
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
 
 case "$CONTAINER" in
   'jboss501')
@@ -19,7 +19,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 $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+    cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
   ;;
   'jboss510')
     JBOSS_BUILD=jboss-5.1.0.GA
@@ -28,7 +28,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 $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+    cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
   ;;
   'jboss600')
     JBOSS_BUILD=jboss-6.0.0.Alpha1
@@ -37,7 +37,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 $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+    cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
   ;;
   'runtime')
 	RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
@@ -79,13 +79,13 @@
 #
 # start jbossas
 #
-$HUDSONDIR/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
 
 # Was it successfully started?
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $RUNTIME_LOG
-  $HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
+  $HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
   exit 1
 fi
 
@@ -100,7 +100,7 @@
 #
 # stop jbossas
 #
-$HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
+$HUDSON_HOME/bin/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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml	2009-05-08 14:54:31 UTC (rev 88443)
@@ -29,7 +29,8 @@
   <builders>
     <hudson.tasks.Shell>
       <command>
-HUDSONDIR=$WORKSPACE/jboss-osgi//build/hudson
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
       
 JBOSS_VERSION=jboss-5.1.0.GA
 
@@ -47,16 +48,16 @@
 # Start JBossAS
 #
 cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # 
 # Was it successfully started?
 #
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $JBOSS_HOME/server/default/log/server.log
-  $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
+  $HUDSON_HOME/bin/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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml	2009-05-08 14:54:31 UTC (rev 88443)
@@ -29,7 +29,8 @@
   <builders>
     <hudson.tasks.Shell>
       <command>
-HUDSONDIR=$WORKSPACE/jboss-osgi//build/hudson
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
       
 JBOSS_VERSION=jboss-6.0.0.Alpha1
 
@@ -47,16 +48,16 @@
 # Start JBossAS
 #
 cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # 
 # Was it successfully started?
 #
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $JBOSS_HOME/server/default/log/server.log
-  $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
+  $HUDSON_HOME/bin/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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml	2009-05-08 14:54:31 UTC (rev 88443)
@@ -44,7 +44,7 @@
     <hudson.tasks.Shell>
       <command>
 OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
 
 export JBOSS_BINDADDR=@jboss.bind.address@
 
@@ -54,7 +54,7 @@
 #
 # call command.sh 
 #
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml	2009-05-08 14:54:31 UTC (rev 88443)
@@ -44,7 +44,7 @@
     <hudson.tasks.Shell>
       <command>
 OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
 
 export JBOSS_BINDADDR=@jboss.bind.address@
 
@@ -54,7 +54,7 @@
 #
 # call command.sh 
 #
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $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:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml	2009-05-08 14:54:31 UTC (rev 88443)
@@ -60,7 +60,7 @@
     <hudson.tasks.Shell>
       <command>
 OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
 
 export FRAMEWORK=$framework
 export CONTAINER=$container
@@ -73,7 +73,7 @@
 #
 # call command.sh 
 #
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $HUDSON_HOME/command.sh
       </command>
     </hudson.tasks.Shell>
   </builders>

More information about the jboss-osgi-commits mailing list