From 79b1891bc153ca01773bab8e4a7389126bf55fdc Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Fri, 26 Dec 2014 19:45:51 +0200 Subject: [PATCH] Make tempest cleanup errors be suppressed in all CI jobs For the moment config option for suppression of error within Tempest cleanup is set only for multibackend job. Make it be set for all jobs. Change-Id: Ic61f164e33ac1fff513947cf7f3e8cef115208ed --- contrib/ci/post_test_hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 4eb121188c..abc1a7eb1e 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -25,14 +25,14 @@ if [[ "$1" =~ "multibackend" ]]; then # backend names are defined in pre_test_hook iniset $BASE/new/tempest/etc/tempest.conf share backend_names "LONDON,PARIS" - - # Suppress errors in cleanup of resources - iniset $BASE/new/tempest/etc/tempest.conf share suppress_errors_in_cleanup True fi # Set two retries for CI jobs iniset $BASE/new/tempest/etc/tempest.conf share share_creation_retry_number 2 +# Suppress errors in cleanup of resources +iniset $BASE/new/tempest/etc/tempest.conf share suppress_errors_in_cleanup True + # let us control if we die or not set +o errexit cd $BASE/new/tempest