diff options
author | Tim Rozet <trozet@redhat.com> | 2016-01-07 21:21:28 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-01-08 08:48:11 -0500 |
commit | 8ddc8cd74a8de55a90d424d780d5ffc750bb8cad (patch) | |
tree | 58dd804f331f71b05697f938fd2aa231b53ff056 /ci | |
parent | ddb27a25b168c79a5f920242e2638e3b4f5d9a97 (diff) |
Moves builds to use local images, minor fix to clean
Change-Id: Ib8a3baa645c4e2a2b7b5c39e8642bae367981f37
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/clean.sh | 8 |
1 files changed, 7 insertions, 1 deletions
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 |