CVS Update: (clem) rocks

[c...@rocks-127.sdsc.edu]

clem 13/02/15 18:25:01

Modified: . builder.sh
Log:
build condor roll only if there is no condor running

If we are building on bat lab we cannot build condor or it will
crash the machine.

Revision Changes Path
1.16 +10 -1 rocks/builder.sh

Index: builder.sh
===================================================================
RCS file: /home/cvs/CVSROOT/rocks/builder.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -t -w -r1.15 -r1.16
--- builder.sh 29 Jan 2013 18:12:29 -0000 1.15
+++ builder.sh 16 Feb 2013 02:25:00 -0000 1.16
@@ -58,7 +58,16 @@

# Build remaining rolls
# Order is important
-ROLLS="area51 condor cvs-server ganglia hpc java sge web-server python perl bio zfs-linux"
+ROLLS="area51"
+
+if ! ps aux|grep condor_master > /dev/null ; then
+ # we can build condor only if there is no condor running
+ ROLLS="$ROLLS condor"
+fi
+
+ROLLS="$ROLLS cvs-server ganglia hpc java sge web-server python perl bio zfs-linux"
+
+
OSVERSION=`lsb_release -rs | cut -d . -f 1`
if [ $OSVERSION -eq 5 ]; then
ROLLS+=" xen"