diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /scripts/review_apps/review-apps.sh | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
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 097fe9c8cca..1214ee5f462 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -245,7 +245,7 @@ function deploy() { IMAGE_REPOSITORY="registry.gitlab.com/gitlab-org/build/cng-mirror" gitlab_migrations_image_repository="${IMAGE_REPOSITORY}/gitlab-rails-ee" gitlab_sidekiq_image_repository="${IMAGE_REPOSITORY}/gitlab-sidekiq-ee" - gitlab_unicorn_image_repository="${IMAGE_REPOSITORY}/gitlab-webservice-ee" + gitlab_webservice_image_repository="${IMAGE_REPOSITORY}/gitlab-webservice-ee" gitlab_task_runner_image_repository="${IMAGE_REPOSITORY}/gitlab-task-runner-ee" gitlab_gitaly_image_repository="${IMAGE_REPOSITORY}/gitaly" gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell" @@ -275,11 +275,11 @@ HELM_CMD=$(cat << EOF --set gitlab.sidekiq.annotations.commit="${CI_COMMIT_SHORT_SHA}" \ --set gitlab.sidekiq.image.repository="${gitlab_sidekiq_image_repository}" \ --set gitlab.sidekiq.image.tag="${CI_COMMIT_REF_SLUG}" \ - --set gitlab.unicorn.annotations.commit="${CI_COMMIT_SHORT_SHA}" \ - --set gitlab.unicorn.image.repository="${gitlab_unicorn_image_repository}" \ - --set gitlab.unicorn.image.tag="${CI_COMMIT_REF_SLUG}" \ - --set gitlab.unicorn.workhorse.image="${gitlab_workhorse_image_repository}" \ - --set gitlab.unicorn.workhorse.tag="${CI_COMMIT_REF_SLUG}" \ + --set gitlab.webservice.annotations.commit="${CI_COMMIT_SHORT_SHA}" \ + --set gitlab.webservice.image.repository="${gitlab_webservice_image_repository}" \ + --set gitlab.webservice.image.tag="${CI_COMMIT_REF_SLUG}" \ + --set gitlab.webservice.workhorse.image="${gitlab_workhorse_image_repository}" \ + --set gitlab.webservice.workhorse.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.task-runner.image.repository="${gitlab_task_runner_image_repository}" \ --set gitlab.task-runner.image.tag="${CI_COMMIT_REF_SLUG}" EOF |