tmp - set verbose

[infrastructure.git] / scripts / nightly-build-vserver.sh

diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh
index b1a98aa..4a540b7 100755 (executable)
--- a/scripts/nightly-build-vserver.sh
+++ b/scripts/nightly-build-vserver.sh
@@ -3,7 +3,7 @@ REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
 
 COMMANDPATH=$0
 COMMAND=$(basename $0)
-ROOT=/build
+#ROOT=/build
 
 # default values, tunable with command-line options
 DEFAULT_FC_DISTRO=fc6
@@ -59,7 +59,7 @@ function build () {
     if [ -n "$TAGSRELEASE" ] ; then
        cd build
        svn up -r $TAGSRELEASE $DISTROMAKETAGS
-       cd -
+       cd - > /dev/null
     fi
 
     show_env
@@ -114,7 +114,7 @@ function runtest () {
 }
 
 function show_env () {
-    echo ROOT=$ROOT
+#    echo ROOT=$ROOT
     echo FC_DISTRO=$FC_DISTRO
     echo DISTRO=$DISTRO
     echo BASE=$BASE
@@ -149,6 +149,7 @@ function usage () {
 
 function main () {
 
+    set -x
     # parse arguments
     MAKEVARS=()
     MAKEOPTS=()
@@ -181,12 +182,11 @@ function main () {
     [ -z "$BASE" ] && BASE=${DISTRO}-${FC_DISTRO}
     BASE=$(echo ${BASE} | sed -e "s,@,${DATE},g")
     
-    # if we run in the root context : 
-    # (*) create or check for the vserver to use
-    # (*) copy this command in the vserver
-    # (*) invoke it
-
     if [ -d /vservers ] ; then
+        # we run in the root context : 
+        # (*) create or check for the vserver to use
+        # (*) copy this command in the vserver
+        # (*) invoke it
        
        if [ -n "$USEOLD" ] ; then
             ### Re-use a vserver (finish an unfinished build..)
@@ -196,7 +196,7 @@ function main () {
            fi
            # update build
            LOG=/vservers/${BASE}.log
-           echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX using existing base $BASE" $(date) >> $LOG 2>&1
+           echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date) >> $LOG 2>&1
            vserver ${BASE} exec svn update /build >> $LOG 2>&1
        else
            # create vserver: check it does not exist yet
@@ -206,31 +206,33 @@ function main () {
                [ -z ${i} ] && BASE=${BASE}-n
                i=$((${i}+1))
                if [ $i -gt 100 ] ; then
-                   echo "$COMMAND: Failed to create release directory /vservers/${BASE}${i}"
+                   echo "$COMMAND: Failed to create build vserver /vservers/${BASE}${i}"
                    exit 1
                fi
            done
            BASE=${BASE}${i}
            LOG=/vservers/${BASE}.log
-           echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX creating base $BASE" $(date) >> $LOG 2>&1
+           echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date) >> $LOG 2>&1
+           show_env >> $LOG 2>&1
            ### extract vbuild.setup and run it
-           svn cat $SVNPATH/vbuild.setup > /tmp/vbuild-$$  2> $LOG
-           svn cat $SVNPATH/${DISTRO}-devel.lst > /tmp/${DISTRO}-devel.lst  2> $LOG
+           svn cat $SVNPATH/vbuild.setup > /tmp/vbuild-$$  2>> $LOG
+           svn cat $SVNPATH/${DISTRO}-devel.lst > /tmp/${DISTRO}-devel.lst  2>> $LOG
             # Create vserver
            cd /tmp
            chmod +x vbuild-$$
-           /tmp/vbuild-$$ ${BASE} ${FC_DISTRO} ${DISTRO}-devel  >> $LOG 2>&1
-           cd -
+           /tmp/vbuild-$$ ${BASE} ${FC_DISTRO} ${DISTRO} >> $LOG 2>&1
+           cd - > /dev/null
            # Extract build
            vserver ${BASE} exec svn checkout ${SVNPATH} /build  >> $LOG 2>&1
        fi
 
-       echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX preparation of vserver $BASE done" $(date) >> $LOG 2>&1
+       echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date) >> $LOG 2>&1
        cp $COMMANDPATH /vservers/${BASE}/
        # invoke this command in the vserver
        vserver ${BASE} exec /$COMMAND "$@"  >> $LOG 2>&1
 
     else
+       echo "In vserver : got args" "$@"
        if [ -n "$DO_BUILD" ] ; then 
            build 
            touch /build-ok