diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-02-16 17:21:04 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-02-16 17:22:04 +0000 |
| commit | 62ca1cf05a8930be33583aebb18716ce93f1a9f8 (patch) | |
| tree | f3d875179130f47fd8adf3be5c4b82291e1cdf0f /prototypes | |
| parent | b180eb70e7554c85d66b25bf280f7bdbbe1249c5 (diff) | |
prototypes: bifrost: Collect logs even if deployment fails
Move the collect-test-info.sh script to the 'exit' trap so we can
collect whatever logs we can even if the bifrost deployment failed.
Upstream change: https://review.openstack.org/433532
Change-Id: Icfbec01d894ff33e83730a40a09dc5540008dbaa
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'prototypes')
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index 914a906f4..3e2381fea 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh @@ -79,6 +79,11 @@ source ${ANSIBLE_INSTALL_ROOT}/ansible/hacking/env-setup ANSIBLE=$(which ansible-playbook) set -x -o nounset +logs_on_exit() { + $SCRIPT_HOME/collect-test-info.sh +} +trap logs_on_exit EXIT + # Change working directory cd $BIFROST_HOME/playbooks @@ -129,6 +134,4 @@ if [ $EXITCODE != 0 ]; then echo "****************************" fi -$SCRIPT_HOME/collect-test-info.sh - exit $EXITCODE |