DEFAULT_BASE="@DATE@--@PLDISTRO@-@FCDISTRO@-@PERSONALITY@"
DEFAULT_SVNPATH="http://svn.planet-lab.org/svn/build/trunk"
DEFAULT_TESTSVNPATH="http://svn.planet-lab.org/svn/tests/trunk/system/"
-DEFAULT_TESTCONFIG32="onelab onelab_testbox32"
-DEFAULT_TESTCONFIG64="onelab onelab_testbox64"
+DEFAULT_TESTCONFIG32="main 1vnodes 1testbox32"
+DEFAULT_TESTCONFIG64="main 1vnodes 1testbox64"
DEFAULT_IFNAME=eth0
# web publishing results
# for the test part
TESTBUILDURL="http://build.one-lab.org/"
-TESTBOXSSH=root@testbox1.one-lab.org
+TESTBOXSSH=root@testbox.one-lab.org
####################
# assuming vserver runs in UTC
DATE=$(date +'%Y.%m.%d')
url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
# compute test directory name on test box
- testdir=test-${BASE}
+ testdir=chroot-${BASE}
+ # use another name if any config contains vserver
+ echo $TESTCONFIG | grep vserver &> /dev/null && testdir=vserver-${BASE}
# clean it
ssh ${TESTBOXSSH} rm -rf ${testdir}
# check it out
ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
# invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
- ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/runtest --build ${SVNPATH} --url ${url} --config "%{TESTCONFIG}" --all
+ configs=""
+ for config in ${TESTCONFIG} ; do
+ configs="$configs --config $config"
+ done
+ ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/runtest --build ${SVNPATH} --url ${url} $configs --all
if [ "$?" != 0 ] ; then
failure