Commit 752f303d authored by Stan Hu's avatar Stan Hu

Merge branch '62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicorn' into 'master'

[CI Review Apps] Change `pullPolicy` to `Always` for `gitlab.sidekiq.image` and `gitlab.unicorn.image` and pass `FORCE_RAILS_IMAGE_BUILDS=true` to the `CNG-mirror` triggered pipeline to always rebuild the Rails image

Closes #62149

See merge request gitlab-org/gitlab-ce!28592
parents 8d30bd91 7c1422c7
...@@ -209,6 +209,7 @@ HELM_CMD=$(cat << EOF ...@@ -209,6 +209,7 @@ HELM_CMD=$(cat << EOF
--timeout 600 \ --timeout 600 \
--set global.appConfig.enableUsagePing=false \ --set global.appConfig.enableUsagePing=false \
--set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \
--set global.imagePullPolicy=Always \
--set global.hosts.hostSuffix="$HOST_SUFFIX" \ --set global.hosts.hostSuffix="$HOST_SUFFIX" \
--set global.hosts.domain="$REVIEW_APPS_DOMAIN" \ --set global.hosts.domain="$REVIEW_APPS_DOMAIN" \
--set certmanager.install=false \ --set certmanager.install=false \
......
...@@ -142,6 +142,7 @@ module Trigger ...@@ -142,6 +142,7 @@ module Trigger
"GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'],
"GITLAB_TAG" => ENV['CI_COMMIT_TAG'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'],
"GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'],
"FORCE_RAILS_IMAGE_BUILDS" => 'true',
"#{edition}_PIPELINE" => 'true' "#{edition}_PIPELINE" => 'true'
} }
end end
......
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