diff options
author | Fatih Degirmenci <fdegir@gmail.com> | 2018-04-13 06:25:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-04-13 06:25:11 +0000 |
commit | 287cd664fcfb18f7a54ce408856641ed17657f44 (patch) | |
tree | bbaa740d8274706df0703cdd06b1f8dd408ed512 /xci | |
parent | bdcba601506cc3a29c0572c0f66538fe4ba4b05d (diff) | |
parent | 5c25f9fc28169f64165c82ba97fa833e3b30e78d (diff) |
Merge "Redirect virsh output to /dev/null in cleanup script"
Diffstat (limited to 'xci')
-rwxr-xr-x | xci/files/xci-destroy-env.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xci/files/xci-destroy-env.sh b/xci/files/xci-destroy-env.sh index 2e183bd7..97b76c7c 100755 --- a/xci/files/xci-destroy-env.sh +++ b/xci/files/xci-destroy-env.sh @@ -27,8 +27,8 @@ if which vbmc &>/dev/null || { [[ -e ${XCI_VENV}/bifrost/bin/activate ]] && sour # Delete all libvirt VMs and hosts from vbmc (look for a port number) for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do if which virsh &>/dev/null; then - virsh destroy $vm || true - virsh undefine $vm || true + virsh destroy $vm &>/dev/null || true + virsh undefine $vm &>/dev/null || true fi vbmc delete $vm done @@ -40,8 +40,8 @@ for varfile in ${flavors[@]}; do source ${XCI_PATH}/xci/config/${varfile}-vars for vm in ${TEST_VM_NODE_NAMES}; do if which virsh &>/dev/null; then - virsh destroy $vm || true - virsh undefine $vm || true + virsh destroy $vm &>/dev/null || true + virsh undefine $vm &>/dev/null || true fi done done |