Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build
index 849c08df527..4890e6912cd 100755
--- a/scripts/gitaly-test-build
+++ b/scripts/gitaly-test-build
@@ -3,14 +3,14 @@
 
 require 'fileutils'
 
-require_relative 'gitaly_test'
+require_relative '../spec/support/helpers/gitaly_setup'
 
 # This script assumes tmp/tests/gitaly already contains the correct
 # Gitaly version. We just have to compile it and run its 'bundle
 # install'. We have this separate script for that to avoid bundle
 # poisoning in CI. This script should only be run in CI.
 class GitalyTestBuild
-  include GitalyTest
+  include GitalySetup
 
   def run
     set_bundler_config
@@ -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