diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gitaly_test.rb | 5 | ||||
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 1 | ||||
| -rwxr-xr-x | scripts/trigger-build | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb index b5d3facd18a..b5cc5118530 100644 --- a/scripts/gitaly_test.rb +++ b/scripts/gitaly_test.rb @@ -23,7 +23,10 @@ module GitalyTest 'BUNDLE_FLAGS' => "--jobs=4 --retry=3", 'BUNDLE_INSTALL_FLAGS' => nil, 'BUNDLE_GEMFILE' => gemfile, - 'RUBYOPT' => nil + 'RUBYOPT' => nil, + + # Git hooks can't run during tests as the internal API is not running. + 'GITALY_TESTING_NO_GIT_HOOKS' => "1" } if ENV['CI'] 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 |