From: Thierry Parmentelat Date: Fri, 10 Jan 2014 08:32:13 +0000 (+0100) Subject: oops X-Git-Tag: before_libvirt_121~86 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=a49f659310d924b4302c1d49fd75a3b6e55d88c8 oops --- diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index 631ad77b..27af6138 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -282,7 +282,7 @@ function run_log () { # toss the build in the bargain, so the tests don't need to mess with extracting it rsync --verbose --archive /vservers/$BASE/build/MODULES/build ${testmaster_ssh}:${BASE}/ - # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh + # invoke test on testbox - pass url and build url - so the tests can use vtest-initvm.sh run_log_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO" # need to proceed despite of set -e @@ -665,7 +665,7 @@ function main () { fi # Create vserver cd $tmpdir - ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} + ./vbuild-initvm.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} # cleanup cd - rm -rf $tmpdir diff --git a/vtest-nightly.sh b/vtest-nightly.sh index b50e621c..36b607aa 100644 --- a/vtest-nightly.sh +++ b/vtest-nightly.sh @@ -187,7 +187,7 @@ function main () { svn export $SVNPATH $tmpdir # Create vserver cd $tmpdir - ./vtest-init-vserver.sh -i eth${TESTVSERVER_DEV} -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL} + ./vtest-initvm.sh -i eth${TESTVSERVER_DEV} -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL} # cleanup cd - rm -rf $tmpdir