diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-04 10:31:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-04 10:31:45 +0000 |
| commit | f8f8ed471f6ce62b7198d49170845f7f5a09cf64 (patch) | |
| tree | c067e4177b96ae95fd653570e0b9316528cbbe50 | |
| parent | 5c140beadf0d7629fc4bb9b574fcc153090155f3 (diff) | |
| parent | 15935833379e1852a4c767f4bba307501e018773 (diff) | |
| download | gitlab-ce-f8f8ed471f6ce62b7198d49170845f7f5a09cf64.tar.gz | |
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
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index c4a81a021a9..6695404653c 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.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: diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 3acbf6a4c51..a9549171b54 100755 --- a/scripts/review_apps/review-apps.sh +++ b/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 \ |