diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 18:06:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 18:06:05 +0000 |
| commit | 930ff68c1efc380cb7522aa9b3884842eecb2486 (patch) | |
| tree | 208f21205f9c8ee90e9722c6f641169d9a1569bf /scripts/review_apps/review-apps.sh | |
| parent | 84727c8209a4412e21111a07f99b0438b03232de (diff) | |
| download | gitlab-ce-930ff68c1efc380cb7522aa9b3884842eecb2486.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps/review-apps.sh')
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 8b64dd3292c..a4fb4749720 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -197,17 +197,17 @@ function download_chart() { function deploy() { local name="$CI_ENVIRONMENT_SLUG" + local edition="${GITLAB_EDITION-ce}" echoinfo "Deploying ${name}..." true IMAGE_REPOSITORY="registry.gitlab.com/gitlab-org/build/cng-mirror" - IMAGE_VERSION="${CI_PROJECT_NAME#gitlab-}" - gitlab_migrations_image_repository="${IMAGE_REPOSITORY}/gitlab-rails-${IMAGE_VERSION}" - gitlab_sidekiq_image_repository="${IMAGE_REPOSITORY}/gitlab-sidekiq-${IMAGE_VERSION}" - gitlab_unicorn_image_repository="${IMAGE_REPOSITORY}/gitlab-unicorn-${IMAGE_VERSION}" - gitlab_task_runner_image_repository="${IMAGE_REPOSITORY}/gitlab-task-runner-${IMAGE_VERSION}" + gitlab_migrations_image_repository="${IMAGE_REPOSITORY}/gitlab-rails-${edition}" + gitlab_sidekiq_image_repository="${IMAGE_REPOSITORY}/gitlab-sidekiq-${edition}" + gitlab_unicorn_image_repository="${IMAGE_REPOSITORY}/gitlab-unicorn-${edition}" + gitlab_task_runner_image_repository="${IMAGE_REPOSITORY}/gitlab-task-runner-${edition}" gitlab_gitaly_image_repository="${IMAGE_REPOSITORY}/gitaly" gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell" - gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-${IMAGE_VERSION}" + gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-${edition}" create_application_secret |