diff options
Diffstat (limited to 'xci/files')
| -rw-r--r-- | xci/files/install-lib.sh | 2 | ||||
| -rwxr-xr-x | xci/files/xci-destroy-env.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xci/files/install-lib.sh b/xci/files/install-lib.sh index 6acaf885..1a6c0b2f 100644 --- a/xci/files/install-lib.sh +++ b/xci/files/install-lib.sh @@ -21,7 +21,7 @@ function install_ansible() { declare -A PKG_MAP # workaround: for latest bindep to work, it needs to use en_US local - export LANG=c + export LANG="C" CHECK_CMD_PKGS=( gcc 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 |