X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=vbuild-nightly.sh;h=ef3582e5d308c3ffdcff82437f78c5323a4a19a2;hb=f1ad601754cc0d9e8db7a4e943f64603ce8961eb;hp=dfd518d80fdca33518f08f8f43f6caa93b1f6bc9;hpb=786dc52c8feb5a1bff79d28173642016347e596a;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index dfd518d8..ef3582e5 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -151,10 +151,10 @@ function build () {
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
     # versions
     make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
+    # store testsvnpath
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true testsvnpath
     # actual stuff
     make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
-    # store TESTSVNPATH
-    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true testsvnpath
 
 }
 
@@ -168,7 +168,7 @@ function runtest () {
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
 
     # where to find TESTSVNPATH
-    stamp=/vserver/$BASE/build/testsvnpath
+    stamp=/vservers/$BASE/build/testsvnpath
     if [ ! -f $stamp ] ; then
 	echo "$COMMAND: Cannot figure TESTSVNPATH from missing $stamp"
 	failure
@@ -197,9 +197,9 @@ function runtest () {
     # test directory name on test box
     testdir=${BASE}
     # clean it
-    ssh ${TESTBOXSSH} rm -rf ${testdir}
+    ssh -n ${TESTBOXSSH} rm -rf ${testdir}
     # check it out
-    ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
+    ssh -n ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
     # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
     configs=""
     for config in ${TESTCONFIG} ; do
@@ -208,11 +208,11 @@ function runtest () {
     
     # need to proceed despite of set -e
     success=true
-    ssh 2>&1 ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all || success=
+    ssh 2>&1 -n ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all || success=
 
     # gather logs in the vserver
     mkdir -p /vservers/$BASE/build/testlogs
-    ssh 2>&1 ${TESTBOXSSH} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
+    ssh 2>&1 -n ${TESTBOXSSH} tar -C ${testdir}/logs -cf - . | tar -C /vservers/$BASE/build/testlogs -xf - || true
     # push them to the build web
     rsync --archive --delete /vservers/$BASE/build/testlogs/ $WEBPATH/$BASE/testlogs/
     chmod -R a+r $WEBPATH/$BASE/testlogs/