Automatic merge of gitlab-org/gitlab-ce master

.gitlab/ci/review.gitlab-ci.yml

@@ -128,8 +128,9 @@ review-stop:
     - source utils.sh
     - source review-apps.sh
   script:
-    - delete
-  artifacts: {}
+    - delete_release
+  artifacts:
+    paths: []
 
 .review-qa-base:
   extends:

scripts/review_apps/review-apps.sh

@@ -36,7 +36,7 @@ function previous_deploy_failed() {
   return $status
 }
 
-function delete() {
+function delete_release() {
   if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
     echoerr "No release given, aborting the delete!"
     return
@@ -193,7 +193,8 @@ function deploy() {
 
 HELM_CMD=$(cat << EOF
   helm upgrade --install \
-    --atomic \
+    --force \
+    --wait \
     --timeout 900 \
     --set releaseOverride="$CI_ENVIRONMENT_SLUG" \
     --set global.appConfig.enableUsagePing=false \