aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries/bash')
-rw-r--r--resources/libraries/bash/function/ansible.sh3
-rw-r--r--resources/libraries/bash/function/common.sh4
2 files changed, 3 insertions, 4 deletions
diff --git a/resources/libraries/bash/function/ansible.sh b/resources/libraries/bash/function/ansible.sh
index 5bf122e4b0..431acc7c5d 100644
--- a/resources/libraries/bash/function/ansible.sh
+++ b/resources/libraries/bash/function/ansible.sh
@@ -28,8 +28,7 @@ function ansible_hosts () {
set -exuo pipefail
if ! installed sshpass; then
- sudo apt-get update -y || die "apt-get update failed!"
- sudo apt-get install -y sshpass || die "Install sshpass failed!"
+ die "Please install sshpass!"
fi
if ! installed ansible-playbook; then
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index f9c9e2ea91..f5e1111a17 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -604,7 +604,7 @@ function reserve_and_cleanup_testbed () {
}
# Cleanup check.
set +e
- cleanup_topo
+ ansible_hosts "cleanup"
result="$?"
set -e
if [[ "${result}" == "0" ]]; then
@@ -1040,7 +1040,7 @@ function untrap_and_unreserve_testbed () {
set -eu
warn "Testbed looks unreserved already. Trap removal failed before?"
else
- cleanup_topo || true
+ ansible_hosts "cleanup" || true
python "${PYTHON_SCRIPTS_DIR}/topo_reservation.py" -c -t "${wt}" || {
die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2
}