Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset +e prior to autodeployer deploys else second deploy fails #1057

Merged
merged 1 commit into from
Nov 7, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/scripts/autodeployer/do-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ if [ $? -eq 0 ]; then
source $NOTIFY "$DEPLOY_TYPE complete" "good"
else
source $NOTIFY "$DEPLOY_TYPE attempt failed. Retrying..." "warning"

# sourcing scripts above may reset -e. Explicitly set prior to meza deploy
set +e
meza deploy "$m_environment" $DEPLOY_ARGS \
> /opt/data-meza/logs/${LOG_PREFIX}`date "+%Y%m%d%H%M%S"`.log 2>&1

Expand All @@ -98,6 +101,7 @@ else
fi
fi

set -e