X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=1207487043343a9e76ee45f33670c23dbe54b30f;hb=ba5cc6adfbad0582d3462b897ddc99ab253a0c37;hp=760e445efb58a9f793df31b9493aa2111dbd8392;hpb=71d4aa4498d60030108fdf8473877ee2aabce895;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 760e445e..12074870 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -174,10 +174,8 @@ function runtest () {
     fi
     url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
 
-    # compute test directory name on test box
-    testdir=chroot-${BASE}
-    # use another name if any config contains vserver
-    echo $TESTCONFIG | grep vserver &> /dev/null && testdir=vserver-${BASE}
+    # test directory name on test box
+    testdir=${BASE}
     # clean it
     ssh ${TESTBOXSSH} rm -rf ${testdir}
     # check it out
@@ -341,6 +339,8 @@ function main () {
 	    set -x
 	    echo "XXXXXXXXXX $COMMAND: using existing vserver $BASE" $(date)
 	    show_env
+	    # start in case e.g. we just rebooted
+	    vserver ${BASE} start || :
 	    # update build
 	    vserver ${BASE} exec svn update /build
 	else
@@ -404,6 +404,8 @@ function main () {
 	rm -rf $WEBPATH/$BASE ; mkdir -p $WEBPATH/$BASE/{RPMS,SRPMS}
 	rsync --archive --delete --verbose /vservers/$BASE/build/RPMS/ $WEBPATH/$BASE/RPMS/
 	rsync --archive --delete --verbose /vservers/$BASE/build/SRPMS/ $WEBPATH/$BASE/SRPMS/
+	# publish myplc-release
+	rsync --verbose /vservers/$BASE/build/myplc-release $WEBPATH/$BASE
 	
 	if [ -n "$DO_TEST" ] ; then 
 	    runtest