test phase more robust

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index cc5ce7a..0e45372 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -13,9 +13,6 @@ function failure () {
 
 # overwrite vserver's internal yum config from what is in
 # .distributions/<distrib>/yum/yum.conf and /yum.repos.d 
-# note : on fc6 I've had trouble with yum.conf, I haven't created a custom yum.conf
-# when using the default yum.conf, 
-# vserver build -m yum complained that /vservers/<v>/var/log/yum.log could not be created
 
 function configure_yum_in_vserver () {
     set -x 

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 746075f..20f7016 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -22,7 +22,7 @@ DEFAULT_WEBPATH="/build/@PLDISTRO@/"
 TESTBUILDURL="http://build.one-lab.org/"
 TESTBOX=onelab-test.inria.fr
 TESTBOXSSH=root@onelab-test.inria.fr
-TESTSVNPATH="http://svn.planet-lab.org/svn/tests/system"
+TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
 TESTSCRIPT=TestMain.py
 ####################
 # assuming vserver runs in UTC
@@ -99,14 +99,20 @@ function runtest () {
     url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
 
     # checkout the system test (formerly known as plctest)
-    cd /build
-    svn export $TESTSVNPATH system-test
+    cd /vservers/${BASE}/build
+    svn export $TESTSVNPATH TESTS
+    # dont trust retcod
+    if [ ! -d TESTS ] ; then 
+       echo "$COMMAND: could not svn export $SVNPATH - check url"
+       exit 1
+    fi
 
   # compute test directory name on test box
-    testdir=system-test-${BASE}
-  # rsync/push test material onto the test box
+    testdir=plctest-${BASE}
+  # rsync/push test material onto the test box - clean first
+    ssh ${TESTBOXSSH} rm -rf ${testdir}
     ssh ${TESTBOXSSH} mkdir -p ${testdir}
-    rsync -a -v system-test/ ${TESTBOXSSH}:${testdir}
+    rsync -a -v TESTS/ ${TESTBOXSSH}:${testdir}/
   # invoke test on testbox
     ssh ${TESTBOXSSH} python -u ${testdir}/${TESTSCRIPT} ${url} 
   #invoke make install from build to the testbox