new branch name

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 4846169..3b7a186 100755 (executable)
--- 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
@@ -187,12 +185,10 @@ function runtest () {
     for config in ${TESTCONFIG} ; do
        configs="$configs --config $config"
     done
-    [ "$PERSONALITY" == linux64 ] && personality="--personality linux64"
-    
     
     # need to proceed despite of set -e
     success=true
-    ssh 2>&1 ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs $personality --all || success=
+    ssh 2>&1 ${TESTBOXSSH} ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all || success=
 
     # gather logs in the vserver
     mkdir -p /vservers/$BASE/build/testlogs