From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 29 Mar 2017 13:46:33 +0000 (+0000)
Subject: Merge "xci: Destroy/undefine only the VMs we created"
X-Git-Tag: danube.1.0~40
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=04f931b3ee3f3226426e384cc379aeb32f5064d0;hp=9951290d0a2fe9c8d60ce5d95abcd3b8b7dabb32;p=releng.git

Merge "xci: Destroy/undefine only the VMs we created"
---

diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index 7d3db90b0..ce9d53538 100755
--- a/prototypes/bifrost/scripts/destroy-env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -14,14 +14,10 @@ if [[ $(whoami) != "root" ]]; then
     exit 1
 fi
 
-# Delete all VMs on the slave since proposed patchsets
-# may leave undesired VM leftovers
-for vm in $(virsh list --all --name); do
+# Delete all libvirt VMs and hosts from vbmc (look for a port number)
+for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
     virsh destroy $vm || true
     virsh undefine $vm || true
-done
-# Delete all hosts from vbmc (look for a port number)
-for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
     vbmc delete $vm
 done