Merge "tests: test-glance-upgrades.sh: Remove the exit trap" into stable/pike
This commit is contained in:
commit
91e544aada
@ -67,18 +67,11 @@ function execute_ansible_playbook {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function gate_job_exit_tasks {
|
|
||||||
source "${COMMON_TESTS_PATH}/test-log-collect.sh"
|
|
||||||
}
|
|
||||||
|
|
||||||
## Main ----------------------------------------------------------------------
|
## Main ----------------------------------------------------------------------
|
||||||
|
|
||||||
# Ensure that the Ansible environment is properly prepared
|
# Ensure that the Ansible environment is properly prepared
|
||||||
source "${COMMON_TESTS_PATH}/test-ansible-env-prep.sh"
|
source "${COMMON_TESTS_PATH}/test-ansible-env-prep.sh"
|
||||||
|
|
||||||
# Set gate job exit traps, this is run regardless of exit state when the job finishes.
|
|
||||||
trap gate_job_exit_tasks EXIT
|
|
||||||
|
|
||||||
# Prepare environment for the initial deploy of previous Glance
|
# Prepare environment for the initial deploy of previous Glance
|
||||||
# No upgrading or testing is done yet.
|
# No upgrading or testing is done yet.
|
||||||
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-glance-install.log"
|
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-glance-install.log"
|
||||||
|
Loading…
Reference in New Issue
Block a user