diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-30 09:27:34 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-30 09:27:34 +0000 |
| commit | a0ee63771684b298a9473ff66afa3ff9aef18a16 (patch) | |
| tree | be85dee61c4446c022045f14c1de56bb0a982dff | |
| parent | 004b72fe165a38dd97cab1fb531f1094261a4eba (diff) | |
| parent | 9870e86f6c9e8899400fe847f741bda6f458a978 (diff) | |
| download | gitlab-ce-a0ee63771684b298a9473ff66afa3ff9aef18a16.tar.gz | |
Merge branch 'qa-use-tiller-2.14.2-for-review-apps' into 'master'
Use the Helm `--atomic` flag when deploying Review Apps
See merge request gitlab-org/gitlab-ce!31238
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 4f617b15a6e..408a0595f9e 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -189,17 +189,11 @@ function deploy() { gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell" gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-${IMAGE_VERSION}" - # Cleanup and previous installs, as FAILED and PENDING_UPGRADE will cause errors with `upgrade` - if [ "$CI_ENVIRONMENT_SLUG" != "production" ] && previous_deploy_failed "$CI_ENVIRONMENT_SLUG" ; then - echo "Deployment in bad state, cleaning up $CI_ENVIRONMENT_SLUG" - delete - fi - create_application_secret HELM_CMD=$(cat << EOF helm upgrade --install \ - --wait \ + --atomic \ --timeout 900 \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set global.appConfig.enableUsagePing=false \ |