From 8ddc8cd74a8de55a90d424d780d5ffc750bb8cad Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 7 Jan 2016 21:21:28 -0500 Subject: Moves builds to use local images, minor fix to clean Change-Id: Ib8a3baa645c4e2a2b7b5c39e8642bae367981f37 Signed-off-by: Tim Rozet --- ci/clean.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/clean.sh b/ci/clean.sh index bc193a34..89e89aa4 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -8,7 +8,13 @@ ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' -virsh vol-delete instack.qcow2 --pool default 2> /dev/null +if ! virsh vol-delete instack.qcow2 --pool default; then + if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then + /usr/bin/touch /var/lib/libvirt/images/instack.qcow2 + virsh vol-delete instack.qcow2 --pool default + fi +fi + rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null # Clean off baremetal VMs in case they exist -- cgit 1.2.3-korg