diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-27 13:01:13 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-03 18:06:45 +0200 |
| commit | 15935833379e1852a4c767f4bba307501e018773 (patch) | |
| tree | 6fbaa0617c0cc1832366bc07d15d56b117500cd0 | |
| parent | 4bf01ce52fc91445d44cd0e993770c030ad53a68 (diff) | |
| download | gitlab-ce-66428-make-review-app-deployment-use-wait.tar.gz | |
Switch back to the '--wait' flag for the 'helm upgrade' command66428-make-review-app-deployment-use-wait
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 fc5b57451de..26db4d05906 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 \ |