Improve and highlight logging to console (2)

[joid.git] / ci / cleanvm.sh

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index 73c61c4..a2609bd 100755 (executable)
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -1,31 +1,25 @@
 #!/bin/bash
 
-set -ex
+set -x
+
+source tools.sh
+
+echo_info "Cleanup Started..."
 
 #use the below commands if you needs to delete the virtual machine
-# also along with envuronment destroy.
+# also along with environment 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.qcow2 /var/lib/libvirt/images/node2-compute.qcow2 /var/lib/libvirt/images/node3-control.qcow2 /var/lib/libvirt/images/node4-control.qcow2 /var/lib/libvirt/images/node5-compute.qcow2 || true
- 
-if [[ "$maasver" > "2" ]]; then
-    sudo virsh destroy bootstrap || true
-    sudo virsh undefine bootstrap || true
-    sudo rm -rf  /var/lib/libvirt/images/bootstrap.qcow2 || true
-fi
+for vm in node1-control node2-compute node3-control node4-control \
+          node5-compute rack-vir-m1 rack-vir-m2 rack-vir-m3 rack-vir-m4 \
+          rack-vir-m1 bootstrap
+do
+    echo "$vm_list" | grep -q " $vm " || continue
+    sudo virsh destroy $vm
+    sudo virsh undefine --nvram $vm
+    sudo rm -f /var/lib/libvirt/images/${vm}.qcow2
+done
 
-echo " Cleanup Finished ..."
+echo_info "Cleanup Finished!"