testing: Ensure no guest is running when modifying images

Sometimes guests are not stopped properly. If images are then modified
they will be corrupted.

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 552e98c52fb31de3898096856e5e6de1882a2422..075fd8e1e4334fde7c2eb272f0d36099c0660bc8 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -7,6 +7,7 @@ DIR=$(dirname `readlink -f $0`)
 . $DIR/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
+running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
 check_commands debootstrap mkfs.ext3 partprobe qemu-img qemu-nbd sfdisk
 

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 245fc2524591725582374fff815165fb0edd66a5..3e107c062064837a72ca36adc6fe52c074e65822 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -25,6 +25,7 @@ HOSTSDIR=$DIR/../hosts
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f $ROOTIMG ] || die "Root image $ROOTIMG not found"
 [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found"
+running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
 check_commands partprobe qemu-img qemu-nbd
 

diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage
index 8e10ce5f3ad7ff39160f2057077fa643ecf4728f..a84104a901aa7b4bd11c4de959b9952f2047fdbd 100755 (executable)
--- a/testing/scripts/build-rootimage
+++ b/testing/scripts/build-rootimage
@@ -22,6 +22,7 @@ DIR=$(dirname `readlink -f $0`)
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
+running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
 check_commands partprobe qemu-img qemu-nbd
 

diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index 69cb833cd39a20261863c0c762f55162248cabde..c52dddda8d749c523577d445ddfd081a8fe11f83 100755 (executable)
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -12,6 +12,7 @@ SWANDIR=${1:+$(readlink -f $1)}
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 [ -f "$ROOTIMG" ] || die "Root image $ROOTIMG not found"
+running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
 [ -f $SWANDIR/src/libstrongswan/asn1/oid.txt ] || die "strongSwan not found in $SWANDIR"
 

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index c4769678c016017b69cdd2f4dce7962d3c4a8595..2dd465c859a97a3752074c20dc944366f7acfd94 100755 (executable)
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -156,6 +156,18 @@ check_commands()
        done
 }
 
+# check if any of the given virtual guests are running
+# $* - names of guests to check
+running_any()
+{
+       command -v virsh >/dev/null || return 1
+       for host in $*
+       do
+               virsh list --name | grep "^$host$" >/dev/null && return 0
+       done
+       return 1
+}
+
 #############################################
 # search and replace strings throughout a
 # whole directory