summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-03-24 15:41:12 -0400
committerFeng Pan <fpan@redhat.com>2016-03-24 15:45:56 -0400
commit5f38edb9a96df7d5927d9b91039144bf4d5f0912 (patch)
tree061484e30c1befb0d571fff8cc837233fe021112
parent673897bcb5a8e1cb7a58941c8b6f7a4c0052c8fe (diff)
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 <fpan@redhat.com>
-rwxr-xr-xci/clean.sh4
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