Commit 6853eeb8 authored by Stan Hu's avatar Stan Hu

Merge branch 'gdk_git' into 'master'

Use git from gdk install if available

See merge request gitlab-org/gitlab!59589
parents 3c50a67b 7ea5145d
......@@ -100,6 +100,9 @@ module Gitlab
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
socket_path: File.join(gitaly_dir, socket_filename),
......@@ -107,7 +110,10 @@ 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
......
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