diff options
Diffstat (limited to 'lib/gitlab/setup_helper.rb')
| -rw-r--r-- | lib/gitlab/setup_helper.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index 7561e36cc33..3ac20724403 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -98,6 +98,10 @@ module Gitlab if Rails.env.test? socket_filename = options[:gitaly_socket] || "gitaly.socket" + prometheus_listen_addr = options[:prometheus_listen_addr] + + git_bin_path = File.expand_path('../gitaly/_build/deps/git/install/bin/git') + git_bin_path = nil unless File.exist?(git_bin_path) config = { # Override the set gitaly_address since Praefect is in the loop @@ -106,8 +110,12 @@ module Gitlab # Compared to production, tests run in constrained environments. This # number is meant to grow with the number of concurrent rails requests / # sidekiq jobs, and concurrency will be low anyway in test. - git: { catfile_cache_size: 5 } - } + git: { + catfile_cache_size: 5, + bin_path: git_bin_path + }.compact, + prometheus_listen_addr: prometheus_listen_addr + }.compact storage_path = Rails.root.join('tmp', 'tests', 'second_storage').to_s storages << { name: 'test_second_storage', path: storage_path } |