Commit ed39900b authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '212643-add-commit-annotation-to-webservice-and-sidekiq' into 'master'

Resolve "Review app deployment is not pulling latest image"

Closes #212643

See merge request gitlab-org/gitlab!31336
parents 9ac52bb4 1a685fd2
...@@ -53,7 +53,7 @@ review-build-cng: ...@@ -53,7 +53,7 @@ review-build-cng:
variables: variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF: "v3.2.2" GITLAB_HELM_CHART_REF: "v3.3.3"
environment: environment:
name: review/${CI_COMMIT_REF_NAME} name: review/${CI_COMMIT_REF_NAME}
url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
......
...@@ -272,8 +272,10 @@ HELM_CMD=$(cat << EOF ...@@ -272,8 +272,10 @@ HELM_CMD=$(cat << EOF
--set gitlab.gitaly.image.tag="v${GITALY_VERSION}" \ --set gitlab.gitaly.image.tag="v${GITALY_VERSION}" \
--set gitlab.gitlab-shell.image.repository="${gitlab_shell_image_repository}" \ --set gitlab.gitlab-shell.image.repository="${gitlab_shell_image_repository}" \
--set gitlab.gitlab-shell.image.tag="v${GITLAB_SHELL_VERSION}" \ --set gitlab.gitlab-shell.image.tag="v${GITLAB_SHELL_VERSION}" \
--set gitlab.sidekiq.annotations.commit="${CI_COMMIT_SHORT_SHA}" \
--set gitlab.sidekiq.image.repository="${gitlab_sidekiq_image_repository}" \ --set gitlab.sidekiq.image.repository="${gitlab_sidekiq_image_repository}" \
--set gitlab.sidekiq.image.tag="${CI_COMMIT_REF_SLUG}" \ --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.repository="${gitlab_unicorn_image_repository}" \
--set gitlab.unicorn.image.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.unicorn.image.tag="${CI_COMMIT_REF_SLUG}" \
--set gitlab.unicorn.workhorse.image="${gitlab_workhorse_image_repository}" \ --set gitlab.unicorn.workhorse.image="${gitlab_workhorse_image_repository}" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment