Merge branch '66428-make-review-app-deployment-use-wait' into 'master'

Make Review App deployment use `--wait` instead of `--atomic` for better debugging

Closes #66428

See merge request gitlab-org/gitlab-ce!32223
This commit is contained in:
Rémy Coutable 2019-09-04 10:31:45 +00:00
commit f8f8ed471f
2 changed files with 6 additions and 4 deletions

View File

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

View File

@ -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 \