From f0c7448fa22e1e35283e57ada4633a9263e671e0 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 16 Dec 2017 13:31:09 +0000 Subject: [PATCH] tests: test-glance-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: I3b4de14b2e98941c948bc23747b85a1a6286b272 --- tests/test-glance-upgrades.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/test-glance-upgrades.sh b/tests/test-glance-upgrades.sh index ce0f3830..66652771 100755 --- a/tests/test-glance-upgrades.sh +++ b/tests/test-glance-upgrades.sh @@ -67,18 +67,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 Glance # No upgrading or testing is done yet. export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-upgrade-pre.yml"