From 1b312463dc2a1aff7dd12a08b8c01a198ba43d85 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 22 Oct 2013 13:02:04 +0000 Subject: don't use global var to indicate failed deploy better use a file that is touched instead. more robust. --- leap-platform-test | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/leap-platform-test b/leap-platform-test index 30379b8..8ab3b75 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -121,7 +121,7 @@ deploy() { if [ -s $ERRLOG1 ] then - deploy_success=false + touch $deploy_failure versions=`versions` msg="From: $MAIL_FROM\nTo: $MAIL_TO\nSubject: leap_platform $PLATFORM_BRANCH branch on \"$vm\" had errors !\n\n" echo "`date`: $msg" | tee -a $LOG1 $LOG2 $ERRLOG2 @@ -174,8 +174,10 @@ reset_deploy() { # have finished echo "Waiting for last deploy process has finished..." wait - - if [ $deploy_success -a -n $MAIL_TO ] + + ls $deploy_failure + + if [ ! -e $deploy_failure -a -n $MAIL_TO ] then versions=`versions` msg="From: $MAIL_FROM\nTo: $MAIL_TO\nSubject: Success ! leap_platform $PLATFORM_BRANCH branch deployed fine\n\n" @@ -268,8 +270,9 @@ all=false print_versions=false # default in lib/leap_cli/leapfile.rb IP_PREFIX='10.5.5' -deploy_success=true +deploy_failure="/tmp/deploy_failure" +[ -e $deploy_failure ] && rm $deploy_failure if ! options=$(getopt -o avVc:h -l all,verbose,versions,config:,help -- "$@") then -- cgit v1.2.3