diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-03-25 01:47:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-25 01:47:56 +0000 |
| commit | 9d3cab8d46e5823fee43a0b6c2f19d5dccfa4c3a (patch) | |
| tree | 2ed1b2160805258e4bcce8bc856dcadf7b344d76 | |
| parent | e45742b51011e726f13739698bdae94594709ecd (diff) | |
| parent | 5f38edb9a96df7d5927d9b91039144bf4d5f0912 (diff) | |
Merge "Fixes occasional VM stoage deleltion failure"
| -rwxr-xr-x | ci/clean.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 58239cc6..c031e5e4 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -20,7 +20,7 @@ vm_index=4 ovs_bridges="br-admin br-private br-public br-storage" # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' -virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' +virsh undefine instack 2> /dev/null || echo -n '' if ! virsh vol-delete instack.qcow2 --pool default 2> /dev/null; then if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then /usr/bin/touch /var/lib/libvirt/images/instack.qcow2 @@ -33,7 +33,7 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null # Clean off baremetal VMs in case they exist for i in $(seq 0 $vm_index); do virsh destroy baremetal$i 2> /dev/null || echo -n '' - virsh undefine baremetal$i --remove-all-storage 2> /dev/null || echo -n '' + virsh undefine baremetal$i 2> /dev/null || echo -n '' /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2 virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null |