diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml index 9dbf3a563..b21cb7b08 100644 --- a/testing/config/kvm/winnetou.xml +++ b/testing/config/kvm/winnetou.xml @@ -35,6 +35,11 @@
+ + + +
+ diff --git a/testing/do-tests b/testing/do-tests index f460d4988..fcadd7942 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -923,17 +923,7 @@ cat >> $INDEX << @EOF echo echo_ok "Passed : $passed_cnt" echo_failed "Failed : $failed_cnt" -echo - -############################################################################## -# copy the test results to the apache server -# - -HTDOCS="/var/www" - -ssh $SSHCONF root@${ipv4_winnetou} mkdir -p $HTDOCS/testresults > /dev/null 2>&1 -scp $SSHCONF -r $TODAYDIR root@${ipv4_winnetou}:$HTDOCS/testresults > /dev/null 2>&1 echo echo "The results are available in $TODAYDIR" echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE" diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index 8fd101003..43a71b921 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -60,6 +60,9 @@ do then execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0 + execute "mkdir $LOOPDIR/var/www/testresults" 0 + echo "echo /testresults ... >> $LOOPDIR/etc/fstab" >>$LOGFILE 2>&1 + echo "/testresults /var/www/testresults 9p trans=virtio,version=9p2000.L 0 0" >> $LOOPDIR/etc/fstab execute_chroot "a2enmod -q cgid" 0 execute_chroot "a2enmod -q rewrite" 0 execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0