X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fcleanvm.sh;h=0fa6b86961a208003effbdbdabe7bf3f3c66c7a9;hb=be17d3ee1982a8b943fb70aa7b01bc472e9221bb;hp=b9bf370ec035c03ad390a291f891c8d3dc8682a5;hpb=7524f897b4b43615c71ceb9853ab74b33d4ecdfb;p=joid.git

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index b9bf370e..0fa6b869 100755
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -1,23 +1,21 @@
 #!/bin/bash
 
-set -ex
+set -x
 
-#use the below commands if you needs to delete the virtual machine
-# also along with envuronment destroy.
+source common/tools.sh
 
-echo " Cleanup Started ..."
-./clean.sh
- 
-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
- 
-echo " Cleanup Finished ..."
+echo_info "Cleanup Started..."
+
+vm_list=$(sudo virsh list --all)
+
+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_info "Cleanup Finished!"