diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-14 21:26:09 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-14 21:26:09 +0000 |
| commit | 752f303d7e86f2b628059fe7a584227fd2cc479a (patch) | |
| tree | 15ea17763bd9c73459c1b00b909730798bb83e32 | |
| parent | 8d30bd91fad15b7486883f8fa4039281a090a1d3 (diff) | |
| parent | 7c1422c79555543062eee10c592f35fbe292fd2f (diff) | |
| download | gitlab-ce-752f303d7e86f2b628059fe7a584227fd2cc479a.tar.gz | |
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
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 1 | ||||
| -rwxr-xr-x | scripts/trigger-build | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 9455e462617..3bae2e08a6f 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -209,6 +209,7 @@ HELM_CMD=$(cat << EOF --timeout 600 \ --set global.appConfig.enableUsagePing=false \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ + --set global.imagePullPolicy=Always \ --set global.hosts.hostSuffix="$HOST_SUFFIX" \ --set global.hosts.domain="$REVIEW_APPS_DOMAIN" \ --set certmanager.install=false \ diff --git a/scripts/trigger-build b/scripts/trigger-build index 9c5fc3c76a5..52bc61cac56 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -142,6 +142,7 @@ module Trigger "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'], "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' } end |