Merge branch 'pks-gitaly-bin-path' into 'master'

Use Gitaly binaries from Gitaly's build directory

See merge request gitlab-org/gitlab!60471

.gitlab/ci/rails.gitlab-ci.yml

@@ -159,18 +159,13 @@ setup-test-env:
     expire_in: 7d
     paths:
       - config/secrets.yml
+      - tmp/tests/gitaly/_build/bin/
       - tmp/tests/gitaly/config.toml
-      - tmp/tests/gitaly/gitaly
       - tmp/tests/gitaly/gitaly2.config.toml
-      - tmp/tests/gitaly/gitaly-git2go
-      - tmp/tests/gitaly/gitaly-hooks
-      - tmp/tests/gitaly/gitaly-lfs-smudge
-      - tmp/tests/gitaly/gitaly-ssh
       - tmp/tests/gitaly/internal/
       - tmp/tests/gitaly/internal_gitaly2/
       - tmp/tests/gitaly/internal_sockets/
       - tmp/tests/gitaly/Makefile
-      - tmp/tests/gitaly/praefect
       - tmp/tests/gitaly/praefect.config.toml
       - tmp/tests/gitaly/ruby/
       - tmp/tests/gitlab-elasticsearch-indexer/bin/gitlab-elasticsearch-indexer

config/gitlab.yml.example

@@ -1422,7 +1422,7 @@ test:
         gitaly_address: unix:tmp/tests/gitaly/praefect.socket
 
   gitaly:
-    client_path: tmp/tests/gitaly
+    client_path: tmp/tests/gitaly/_build/bin
     token: secret
   workhorse:
     secret_file: tmp/gitlab_workhorse_test_secret

scripts/gitaly-test-build

@@ -31,8 +31,8 @@ class GitalyTestBuild
     # Make the 'gitaly' executable look newer than 'GITALY_SERVER_VERSION'.
     # Without this a gitaly executable created in the setup-test-env job
     # will look stale compared to GITALY_SERVER_VERSION.
-    FileUtils.touch(File.join(tmp_tests_gitaly_dir, 'gitaly'), mtime: Time.now + (1 << 24))
-    FileUtils.touch(File.join(tmp_tests_gitaly_dir, 'praefect'), mtime: Time.now + (1 << 24))
+    FileUtils.touch(File.join(tmp_tests_gitaly_bin_dir, 'gitaly'), mtime: Time.now + (1 << 24))
+    FileUtils.touch(File.join(tmp_tests_gitaly_bin_dir, 'praefect'), mtime: Time.now + (1 << 24))
   end
 end
 

spec/support/helpers/gitaly_setup.rb

@@ -22,6 +22,10 @@ module GitalySetup
     File.expand_path('../../../tmp/tests/gitaly', __dir__)
   end
 
+  def tmp_tests_gitaly_bin_dir
+    File.join(tmp_tests_gitaly_dir, '_build', 'bin')
+  end
+
   def tmp_tests_gitlab_shell_dir
     File.expand_path('../../../tmp/tests/gitlab-shell', __dir__)
   end
@@ -110,7 +114,7 @@ module GitalySetup
   end
 
   def start(service)
-    args = ["#{tmp_tests_gitaly_dir}/#{service_binary(service)}"]
+    args = ["#{tmp_tests_gitaly_bin_dir}/#{service_binary(service)}"]
     args.push("-config") if service == :praefect
     args.push(config_path(service))
     pid = spawn(env, *args, [:out, :err] => "log/#{service}-test.log")