add option -P in lbuild-initvm

[build.git] / lbuild-nightly.sh

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 5b5c2b9..ccf7b66 100755 (executable)
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -147,8 +147,8 @@ function failure() {
     if test -z "$WEBLOG" ; then
        WEBHOST=$(hostname)
        WEBPATH=/tmp
-       WEBBASE=/tmp/vbuild-early-$(date +%Y-%m-%d)
-       WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
+       WEBBASE=/tmp/lbuild-early-$(date +%Y-%m-%d)
+       WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
     fi
     webpublish mkdir -p $WEBBASE ||:
     webpublish_cp_local_to_remote $LOG $WEBLOG ||:
@@ -176,7 +176,7 @@ function success () {
     if test -z "$WEBLOG" ; then
        WEBHOST=$(hostname)
        WEBPATH=/tmp
-       WEBLOG=/tmp/vbuild-early-$(date +%Y-%m-%d).log.txt
+       WEBLOG=/tmp/lbuild-early-$(date +%Y-%m-%d).log.txt
     fi
     webpublish mkdir -p $WEBBASE
     webpublish_cp_local_to_remote $LOG $WEBLOG
@@ -672,13 +672,14 @@ function main () {
 
             # Create lxc vm
            cd $tmpdir
-           ./vbuild-init-lxc.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} 
+           ./lbuild-initvm.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} 
            # cleanup
            cd -
            rm -rf $tmpdir
            # Extract build again - in the vm
            [ -n "$SSH_KEY" ] && setupssh ${BASE} ${SSH_KEY}
-           lxcsu -ro $BASE bash -c "git clone $GIT_REPO /build; cd /build; git checkout $GIT_TAG"
+           # xxx not working as of now - waiting for Sapan to look into this
+           lxcsu -ro $BASE -- bash -c "git clone $GIT_REPO /build; cd /build; git checkout $GIT_TAG"
        fi
        echo "XXXXXXXXXX $COMMAND: preparation of vm $BASE done" $(date)