summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-08-18 05:02:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-18 05:02:50 +0000
commit5488e03ba1a47f94f04d9ed64fa3d62fa87049c1 (patch)
tree7a3802777b9c0f931c267e8af3d3198880aa5c8e
parent1c81dd885d74bfb2d41696d601c9fe2efffcd1d8 (diff)
parent5b0410aa4f51e50df6b171cf8592a7bfaa6de796 (diff)
Merge "prototypes: bifrost: destroy-env: Always destroy XCI VMs"
-rwxr-xr-xbifrost/scripts/destroy-env.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh
index c75e814b..87f792a5 100755
--- a/bifrost/scripts/destroy-env.sh
+++ b/bifrost/scripts/destroy-env.sh
@@ -25,6 +25,12 @@ for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
virsh undefine $vm || true
vbmc delete $vm
done
+# Destroy all XCI VMs if the previous operation failed
+[[ -n ${XCI_FLAVOR} ]] && \
+ for vm in ${TEST_VM_NODE_NAMES}; do
+ virsh destroy $vm || true
+ virsh undefine $vm || true
+ done
service ironic-conductor stop || true