denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Mount and serve testresults from the host

Browse Source 
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.
This commit is contained in:
Tobias Brunner
2016-08-29 18:11:42 +02:00
parent 7a8985b575
commit dda06b0439
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/config/kvm/winnetou.xml
+5
View File
@@ -35,6 +35,11 @@
<target dir='/hostshare'/> <target dir='/hostshare'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
</filesystem> </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'> <interface type='network'>
<mac address='52:54:00:4b:23:fa'/> <mac address='52:54:00:4b:23:fa'/>
<source network='vnet1'/> <source network='vnet1'/>
testing/do-tests
-10
View File
@@ -923,17 +923,7 @@ cat >> $INDEX << @EOF
echo echo
echo_ok "Passed : $passed_cnt" echo_ok "Passed : $passed_cnt"
echo_failed "Failed : $failed_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
echo "The results are available in $TODAYDIR" echo "The results are available in $TODAYDIR"
echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE" echo "or via the link http://$ipv4_winnetou/testresults/$TESTDATE"
testing/scripts/build-guestimages
+3
View File
@@ -60,6 +60,9 @@ do
then then
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 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 cgid" 0
execute_chroot "a2enmod -q rewrite" 0 execute_chroot "a2enmod -q rewrite" 0
execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0 execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0