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:
commit
f8f8ed471f
|
@ -128,8 +128,9 @@ review-stop:
|
||||||
- source utils.sh
|
- source utils.sh
|
||||||
- source review-apps.sh
|
- source review-apps.sh
|
||||||
script:
|
script:
|
||||||
- delete
|
- delete_release
|
||||||
artifacts: {}
|
artifacts:
|
||||||
|
paths: []
|
||||||
|
|
||||||
.review-qa-base:
|
.review-qa-base:
|
||||||
extends:
|
extends:
|
||||||
|
|
|
@ -36,7 +36,7 @@ function previous_deploy_failed() {
|
||||||
return $status
|
return $status
|
||||||
}
|
}
|
||||||
|
|
||||||
function delete() {
|
function delete_release() {
|
||||||
if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
|
if [ -z "$CI_ENVIRONMENT_SLUG" ]; then
|
||||||
echoerr "No release given, aborting the delete!"
|
echoerr "No release given, aborting the delete!"
|
||||||
return
|
return
|
||||||
|
@ -193,7 +193,8 @@ function deploy() {
|
||||||
|
|
||||||
HELM_CMD=$(cat << EOF
|
HELM_CMD=$(cat << EOF
|
||||||
helm upgrade --install \
|
helm upgrade --install \
|
||||||
--atomic \
|
--force \
|
||||||
|
--wait \
|
||||||
--timeout 900 \
|
--timeout 900 \
|
||||||
--set releaseOverride="$CI_ENVIRONMENT_SLUG" \
|
--set releaseOverride="$CI_ENVIRONMENT_SLUG" \
|
||||||
--set global.appConfig.enableUsagePing=false \
|
--set global.appConfig.enableUsagePing=false \
|
||||||
|
|
Loading…
Reference in New Issue