From 6b739f21e3fade24be51898e672dee9098402574 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 16 Dec 2017 13:32:24 +0000 Subject: [PATCH] tests: test-cinder-upgrades.sh: Remove the exit trap We are already collecting logs as part of the post-run playbook so we don't need to do that as part of the exit trap. This avoid collecting and compressing the logs twice. Change-Id: I6e6a232a213f0951f3d5fff8b4efac5898ce6d76 --- tests/test-cinder-upgrades.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/test-cinder-upgrades.sh b/tests/test-cinder-upgrades.sh index c151e2a1..15b06915 100755 --- a/tests/test-cinder-upgrades.sh +++ b/tests/test-cinder-upgrades.sh @@ -66,18 +66,11 @@ function execute_ansible_playbook { } -function gate_job_exit_tasks { - source "${COMMON_TESTS_PATH}/test-log-collect.sh" -} - ## Main ---------------------------------------------------------------------- # Ensure that the Ansible environment is properly prepared 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 Cinder # No upgrading or testing is done yet. export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-install.log"