summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-28 19:20:37 +0200
committerMarkos Chandras <mchandras@suse.de>2017-03-29 09:49:57 +0000
commit6299cd14079d45937261790d71f7f55187b41289 (patch)
tree87331aeb8bb43f4ecd1fcc4b0a965ffc70a361e8
parent2f14f91f142709b4ec2c91f78a99ecdbe896046d (diff)
xci: Destroy/undefine only the VMs we created
Destroying/undefining all the VMs on host might cause issues for the users. This change tries to reduce the possibility of it by removing VMs listed by vbmc. Change-Id: I5134043309722632df68a0800c6403e6f39a8d16 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rwxr-xr-xprototypes/bifrost/scripts/destroy-env.sh8
1 files changed, 2 insertions, 6 deletions
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