From 5f38edb9a96df7d5927d9b91039144bf4d5f0912 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 24 Mar 2016 15:41:12 -0400 Subject: Fixes occasional VM stoage deleltion failure Removes --remove-all-storage option in ci/clean.sh JIRA: APEX-121 Change-Id: Ia8063112333d12d09cfb16dd1a02e14551dae7d7 Signed-off-by: Feng Pan --- ci/clean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci') 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 -- cgit 1.2.3-korg