Merge branch 'sh-fix-gitaly-test-build' into 'master'

Fix errors spawning Gitaly master in CI

Closes gitaly#2831

See merge request gitlab-org/gitlab!33578

lib/gitlab/setup_helper.rb

@@ -79,6 +79,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] = Gitlab.config.gitaly.client_path
+          config[:gitlab] = { url: Gitlab.config.gitlab.url }
 
           TomlRB.dump(config)
         end
@@ -97,7 +98,8 @@ module Gitlab
         def configuration_toml(gitaly_dir, storage_paths)
           nodes = [{ storage: 'default', address: "unix:#{gitaly_dir}/gitaly.socket", primary: true, token: 'secret' }]
           storages = [{ name: 'default', node: nodes }]
-          config = { socket_path: "#{gitaly_dir}/praefect.socket", memory_queue_enabled: true, virtual_storage: storages }
+          failover = { enabled: false }
+          config = { socket_path: "#{gitaly_dir}/praefect.socket", memory_queue_enabled: true, virtual_storage: storages, failover: failover }
           config[:token] = 'secret' if Rails.env.test?
 
           TomlRB.dump(config)

scripts/gitaly-test-build

@@ -14,6 +14,7 @@ class GitalyTestBuild
   def run
     abort 'gitaly build failed' unless system(env, 'make', chdir: tmp_tests_gitaly_dir)
 
+    ensure_gitlab_shell_secret!
     check_gitaly_config!
 
     # Starting gitaly further validates its configuration

scripts/gitaly_test.rb

@@ -4,6 +4,7 @@
 # Please be careful when modifying this file. Your changes must work
 # both for local development rspec runs, and in CI.
 
+require 'securerandom'
 require 'socket'
 
 module GitalyTest
@@ -11,10 +12,22 @@ module GitalyTest
     File.expand_path('../tmp/tests/gitaly', __dir__)
   end
 
+  def tmp_tests_gitlab_shell_dir
+    File.expand_path('../tmp/tests/gitlab-shell', __dir__)
+  end
+
+  def rails_gitlab_shell_secret
+    File.expand_path('../.gitlab_shell_secret', __dir__)
+  end
+
   def gemfile
     File.join(tmp_tests_gitaly_dir, 'ruby', 'Gemfile')
   end
 
+  def gitlab_shell_secret_file
+    File.join(tmp_tests_gitlab_shell_dir, '.gitlab_shell_secret')
+  end
+
   def env
     env_hash = {
       'HOME' => File.expand_path('tmp/tests'),
@@ -70,6 +83,20 @@ module GitalyTest
     pid
   end
 
+  # Taken from Gitlab::Shell.generate_and_link_secret_token
+  def ensure_gitlab_shell_secret!
+    secret_file = rails_gitlab_shell_secret
+    shell_link = gitlab_shell_secret_file
+
+    unless File.size?(secret_file)
+      File.write(secret_file, SecureRandom.hex(16))
+    end
+
+    unless File.exist?(shell_link)
+      FileUtils.ln_s(secret_file, shell_link)
+    end
+  end
+
   def check_gitaly_config!
     puts "Checking gitaly-ruby Gemfile..."