Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 2 deletions

diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build
index 00927646046..62d3dbda911 100755
--- a/scripts/gitaly-test-build
+++ b/scripts/gitaly-test-build
@@ -12,7 +12,7 @@ class GitalyTestBuild
   include GitalyTest
 
   def run
-    abort 'gitaly build failed' unless system(env, 'make', chdir: tmp_tests_gitaly_dir)
+    abort 'gitaly build failed' unless build_gitaly
 
     ensure_gitlab_shell_secret!
     check_gitaly_config!
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn
index c2ff9cd08aa..caa41a9a0c3 100755
--- a/scripts/gitaly-test-spawn
+++ b/scripts/gitaly-test-spawn
@@ -8,6 +8,7 @@ class GitalyTestSpawn
   include GitalyTest
 
   def run
+    install_gitaly_gems if ENV['CI']
     check_gitaly_config!
 
     # # Uncomment line below to see all gitaly logs merged into CI trace
diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb
index 559ad8f4345..c7b3f72d590 100644
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -41,7 +41,7 @@ module GitalyTest
       'HOME' => File.expand_path('tmp/tests'),
       'GEM_PATH' => Gem.path.join(':'),
       'BUNDLE_APP_CONFIG' => File.join(File.dirname(gemfile), '.bundle/config'),
-      'BUNDLE_FLAGS' => "--jobs=4 --retry=3 --quiet",
+      'BUNDLE_FLAGS' => "--jobs=4 --retry=3",
       'BUNDLE_INSTALL_FLAGS' => nil,
       'BUNDLE_GEMFILE' => gemfile,
       'RUBYOPT' => nil,
@@ -78,6 +78,14 @@ module GitalyTest
     end
   end
 
+  def install_gitaly_gems
+    system(env, "make #{tmp_tests_gitaly_dir}/.ruby-bundle", chdir: tmp_tests_gitaly_dir) # rubocop:disable GitlabSecurity/SystemCommandInjection
+  end
+
+  def build_gitaly
+    system(env, 'make', chdir: tmp_tests_gitaly_dir) # rubocop:disable GitlabSecurity/SystemCommandInjection
+  end
+
   def start_gitaly
     start(:gitaly)
   end