Merge branch 'pks-gitaly-with-bundled-git' into 'master'

spec: Convert Gitaly setup to use bundled Git binaries

See merge request gitlab-org/gitlab!78898

lib/gitlab/setup_helper.rb

@@ -113,7 +113,7 @@ module Gitlab
               # sidekiq jobs, and concurrency will be low anyway in test.
               git: {
                 catfile_cache_size: 5,
-                bin_path: File.expand_path(File.join(gitaly_dir, '_build', 'deps', 'git', 'install', 'bin', 'git'))
+                use_bundled_binaries: true
               },
               prometheus_listen_addr: prometheus_listen_addr
             }.compact
@@ -130,7 +130,7 @@ module Gitlab
 
           config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
-          config[:bin_dir] = File.join(gitaly_dir, '_build', 'bin') # binaries by default are in `_build/bin`
+          config[:bin_dir] = File.expand_path(File.join(gitaly_dir, '_build', 'bin')) # binaries by default are in `_build/bin`
           config[:gitlab] = { url: Gitlab.config.gitlab.url }
           config[:logging] = { dir: Rails.root.join('log').to_s }
 

spec/support/helpers/gitaly_setup.rb

@@ -120,7 +120,7 @@ module GitalySetup
   end
 
   def build_gitaly
-    run_command(%w[make all git], env: env.merge('GIT_VERSION' => nil))
+    run_command(%w[make all WITH_BUNDLED_GIT=YesPlease], env: env.merge('GIT_VERSION' => nil))
   end
 
   def start_gitaly(toml = nil)
@@ -327,8 +327,8 @@ module GitalySetup
 
     message += "\nCheck log/gitaly-test.log for errors.\n"
 
-    unless ci?
-      message += "\nIf binaries are missing, try running `make -C tmp/tests/gitaly build git.`\n"
+    unless ENV['CI']
+      message += "\nIf binaries are missing, try running `make -C tmp/tests/gitaly all WITH_BUNDLED_GIT=YesPlease`.\n"
       message += "\nOtherwise, try running `rm -rf #{tmp_tests_gitaly_dir}`."
     end
 
@@ -336,7 +336,7 @@ module GitalySetup
   end
 
   def git_binary
-    File.join(tmp_tests_gitaly_dir, "_build", "deps", "git", "install", "bin", "git")
+    File.join(tmp_tests_gitaly_dir, "_build", "bin", "gitaly-git")
   end
 
   def gitaly_binary