summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-22 13:02:04 +0000
committervarac <varacanero@zeromail.org>2013-10-22 13:02:04 +0000
commit1b312463dc2a1aff7dd12a08b8c01a198ba43d85 (patch)
tree32203db58d0f2373b6d1252fbfaef2debd622887
parent55ce142b2eefd1866c113b45a40d3742f599caa5 (diff)
don't use global var to indicate failed deploy
better use a file that is touched instead. more robust.
-rwxr-xr-xleap-platform-test11
1 files 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