modified to use /srv instead of /dev/sdb for ceph.

[joid.git] / ci / cleanvm.sh

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index f7f062a..3756c40 100755 (executable)
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -1,31 +1,22 @@
 #!/bin/bash
 
-set -ex
+set -x
+
+echo " Cleanup Started ..."
 
 #use the below commands if you needs to delete the virtual machine
 # also along with envuronment destroy.
+./clean.sh
 
-echo " Cleanup Started ..."
-./clean.sh || true
- 
-maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ //'`
+vm_list=$(sudo virsh list --all)
 
-sudo virsh destroy node1-control || true
-sudo virsh destroy node3-control || true
-sudo virsh destroy node4-control || true
-sudo virsh destroy node2-compute || true
-sudo virsh destroy node5-compute || true
-sudo virsh undefine node1-control || true
-sudo virsh undefine node3-control || true
-sudo virsh undefine node4-control || true
-sudo virsh undefine node2-compute || true
-sudo virsh undefine node5-compute || true
-sudo rm -rf  /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node5-compute.img || true
- 
-if [[ "$maasver" > "2" ]]; then
-    sudo virsh destroy bootstrap || true
-    sudo virsh undefine bootstrap || true
-    sudo rm -rf  /var/lib/libvirt/images/bootstrap.img || true
-fi
+for vm in node1-control node2-compute node3-control node4-control \
+          node5-compute bootstrap
+do
+    echo "$vm_list" | grep -q " $vm " || continue
+    sudo virsh destroy $vm
+    sudo virsh undefine $vm
+    sudo rm -f /var/lib/libvirt/images/${vm}.qcow2
+done
 
 echo " Cleanup Finished ..."