testing: Mount and serve testresults from the host

This avoids having to copy testresults, makes results of cancelled runs
browsable (runs may actually be followed live) and preserves old results
when rebuilding guest images (e.g. when using the build-strongswan script).
The number of consecutive test runs without any intermittent rebuild of the
guest images is also not limited by the image size anymore.

diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index 9dbf3a563a0de4b1714ecb67f3e5adc47f52cd0a..b21cb7b08fcc9df1730ae4ac1e1bb78f36ddea4c 100644 (file)
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -35,6 +35,11 @@
       <target dir='/hostshare'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </filesystem>
+    <filesystem type='mount' accessmode='mapped'>
+      <source dir='/var/run/kvm-swan-testresults'/>
+      <target dir='/testresults'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:4b:23:fa'/>
       <source network='vnet1'/>

diff --git a/testing/do-tests b/testing/do-tests
index f460d49885f9cb948113d22898b20dceb9440f94..fcadd79420efae7c1b16c2c39debe271d44f4e2c 100755 (executable)
--- 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 8fd101003da1689540874ed245a609884a560c1d..43a71b921b033d29e211ed86ab6f9717f503ff91 100755 (executable)
--- 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