diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 18:06:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 18:06:28 +0000 |
| commit | 7b25b12016eeca73262cf2a618b411fb911295e1 (patch) | |
| tree | 9198dc42c9f1151184f276d11d90c5193544eb1c /.gitlab | |
| parent | aa542224bb345acf0cb9a1a606f0a802c16b0336 (diff) | |
| download | gitlab-ce-7b25b12016eeca73262cf2a618b411fb911295e1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index a790dd3e02f..8e91d053ca0 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -94,7 +94,10 @@ schedule:review-build-cng: variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" - GITLAB_HELM_CHART_REF: "v2.4.4" + # v2.4.4 + two improvements: + # - Allow to pass an EE license when installing the chart: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/1008 + # - Allow to customize the livenessProbe for `gitlab-shell`: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/1021 + GITLAB_HELM_CHART_REF: "6c655ed77e60f1f7f533afb97bef8c9cb7dc61eb" GITLAB_EDITION: "ce" environment: name: review/${CI_COMMIT_REF_NAME} @@ -116,21 +119,13 @@ schedule:review-build-cng: - source scripts/review_apps/review-apps.sh - export REVIEW_APP_CONFIG_CHANGED=$(base_config_changed) script: - - date - check_kube_domain - - date - ensure_namespace - - date - install_tiller - - date - install_external_dns - - date - download_chart - date - deploy || (display_deployment_debug && exit 1) - - date - - add_license - - date artifacts: paths: [review_app_url.txt] expire_in: 2 days |