better support for old mitaka openstack release,

[joid.git] / ci / cleanvm.sh

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
old mode 100644 (file)
new mode 100755 (executable)
index 0cb513e..c9acc90
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -6,16 +6,18 @@ set -ex
 # also along with envuronment destroy.
 
 echo " Cleanup Started ..."
-./clean.sh
+./clean.sh || true
+ 
+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
  
-virsh destroy opnfv-maas || true
-virsh destroy bootstrap || true
-virsh destroy node1-control || true
-virsh destroy node2-compute || true
-virsh undefine opnfv-maas || true
-virsh undefine bootstrap || true
-virsh undefine node1-control || true
-virsh undefine node2-compute || true
-sudo rm -rf  /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img || true
-
 echo " Cleanup Finished ..."