test: Use GitalySetup to build Gitaly in test

To have better control on how `make` is ran to build Gitaly, run it from
the GitalySetup helper module.

lib/tasks/gitlab/gitaly.rake

@@ -25,9 +25,6 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
       storage_paths = { 'default' => args.storage_path }
       Gitlab::SetupHelper::Gitaly.create_configuration(args.dir, storage_paths)
 
-      # In CI we run scripts/gitaly-test-build
-      next if ENV['CI'].present?
-
       Dir.chdir(args.dir) do
         Bundler.with_original_env do
           env = { "RUBYOPT" => nil, "BUNDLE_GEMFILE" => nil }

spec/support/helpers/gitaly_setup.rb

@@ -12,6 +12,8 @@ require 'logger'
 require 'bundler'
 
 module GitalySetup
+  extend self
+
   LOGGER = begin
     default_name = ENV['CI'] ? 'DEBUG' : 'WARN'
     level_name = ENV['GITLAB_TESTING_LOG_LEVEL']&.upcase

spec/support/helpers/test_env.rb

@@ -161,9 +161,13 @@ module TestEnv
     component_timed_setup('Gitaly',
       install_dir: gitaly_dir,
       version: Gitlab::GitalyClient.expected_server_version,
-      task: "gitlab:gitaly:install",
+      task: "gitlab:gitaly:clone",
       fresh_install: ENV.key?('FORCE_GITALY_INSTALL'),
       task_args: [gitaly_dir, repos_path, gitaly_url].compact) do
+        unless ci? # In CI we run scripts/gitaly-test-build
+          GitalySetup.build_gitaly
+        end
+
         Gitlab::SetupHelper::Gitaly.create_configuration(
           gitaly_dir,
           { 'default' => repos_path },