Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 8 insertions, 1 deletions

diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build
index 4890e6912cd..e6afadccc7e 100755
--- a/scripts/gitaly-test-build
+++ b/scripts/gitaly-test-build
@@ -15,7 +15,14 @@ class GitalyTestBuild
   def run
     set_bundler_config
 
-    abort 'gitaly build failed' unless build_gitaly
+    # If we have the binaries from the cache, we can skip building them again
+    if File.exist?(tmp_tests_gitaly_bin_dir)
+      GitalySetup::LOGGER.debug "Gitaly binary already built. Skip building...\n"
+      # We still need to install the gems in that case
+      install_gitaly_gems
+    else
+      abort 'gitaly build failed' unless build_gitaly
+    end
 
     ensure_gitlab_shell_secret!
     check_gitaly_config!