Removes --remove-all-storage option in ci/clean.sh
JIRA: APEX-121
Change-Id: I6c0f4febe1f6543f3407b329a5f18df81e02d28c
Signed-off-by: Feng Pan <fpan@redhat.com>
ovs_bridges="brbm brbm1 brbm2 brbm3"
# Clean off instack VM
virsh destroy instack 2> /dev/null || echo -n ''
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 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
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
# Clean off baremetal VMs in case they exist
for i in $(seq 0 $vm_index); do
virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
# Clean off baremetal VMs in case they exist
for i in $(seq 0 $vm_index); do
virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
- virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n ''
+ virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
/usr/bin/touch /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2
virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null
rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null
/usr/bin/touch /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2
virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null
rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null