diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 09:08:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 09:08:35 +0000 |
| commit | 23ff717a29540bb1d4b0068f164b5f9df99386bf (patch) | |
| tree | 1d31f1766f3a5e4748cd806cf655d72d35cb59dc /scripts/review_apps | |
| parent | c2879da99d02b4e49a1394f5699a2963f2651f18 (diff) | |
| download | gitlab-ce-23ff717a29540bb1d4b0068f164b5f9df99386bf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
| -rw-r--r-- | scripts/review_apps/base-config.yaml | 2 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index a34bb23a5e6..6fb6943fb90 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -66,7 +66,7 @@ gitlab: limits: cpu: 100m memory: 700M - unicorn: + webservice: resources: requests: cpu: 746m 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 |