summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-07-29 13:24:33 +0200
committerRémy Coutable <remy@rymai.me>2019-07-30 09:25:28 +0200
commit9870e86f6c9e8899400fe847f741bda6f458a978 (patch)
tree7ff8b4eab7f51a1958478cc759ead00b29d39bab
parent14e7cbe5813db792a4591565ea872745937e8406 (diff)
downloadgitlab-ce-9870e86f6c9e8899400fe847f741bda6f458a978.tar.gz
Use the --atomic flag when deploying Review Appsqa-use-tiller-2.14.2-for-review-apps
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rwxr-xr-xscripts/review_apps/review-apps.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh
index 4f617b15a6e..408a0595f9e 100755
--- a/scripts/review_apps/review-apps.sh
+++ b/scripts/review_apps/review-apps.sh
@@ -189,17 +189,11 @@ function deploy() {
gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell"
gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-${IMAGE_VERSION}"
- # Cleanup and previous installs, as FAILED and PENDING_UPGRADE will cause errors with `upgrade`
- if [ "$CI_ENVIRONMENT_SLUG" != "production" ] && previous_deploy_failed "$CI_ENVIRONMENT_SLUG" ; then
- echo "Deployment in bad state, cleaning up $CI_ENVIRONMENT_SLUG"
- delete
- fi
-
create_application_secret
HELM_CMD=$(cat << EOF
helm upgrade --install \
- --wait \
+ --atomic \
--timeout 900 \
--set releaseOverride="$CI_ENVIRONMENT_SLUG" \
--set global.appConfig.enableUsagePing=false \