gitlab-qa 5.15.0 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ae85f17e98b415ac5fddd505d5cf9d37462bbcc5b0eabee7584c3a26803542
-  data.tar.gz: 62ea7475a8d3eddb193a975c440fc19b2177ea612ecf8a02d9bbf9a8c926f177
+  metadata.gz: bc79855be61afd8dfaef793cb1a6520bde1f07f6c44a18b9fdd605e26ac947c4
+  data.tar.gz: d326f64befb861020097fd55b9772b54d7014509e87c5c13c71e619c11a21a65
 SHA512:
-  metadata.gz: 35e187728145ac187fda0dbe3b41b24d44adc52a3cb8718083736ccf0e36f06a089c74e97db983b4b40f2eb432fa847c440208e083df24d8f9a5df76a495b0d7
-  data.tar.gz: a7e08091352126ada545f61b6d7a940e0eb87f4ec9d9753fa0521244c2f35b209a0474eb158b7e82486ee7fe5ae59047d3748fd6aadd36922d96b9520081b177
+  metadata.gz: e497734ed2d4d9d58c2dcdf051eb3a4a6ad02adcfc7954ae54ac83ee912b47ff0d6f8478ea6e272a8a93feb14cdda8d55632fb0f92e97379596a12b67ee25f57
+  data.tar.gz: fc927589ca591708a7b61341acf69d48125812642ce9ca87f0183cf11bcf14c55d6bfa8bb04fe1cf3c4685e1d4da0781bab6af15a942c0675ae149fac8b20704

data/.gitlab-ci.yml

@@ -832,6 +832,44 @@ ee:praefect-quarantine:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
+ce:gitaly-cluster:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ce:gitaly-cluster-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ee:gitaly-cluster:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
+ee:gitaly-cluster-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::GitalyCluster"
+
 ce:smtp:
   extends:
     - .test
@@ -893,7 +931,8 @@ ee:jira-quarantine:
 staging:
   script:
     - unset EE_LICENSE
-    - exe/gitlab-qa Test::Instance::Staging
+    - 'echo "Running: exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
+    - exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
   extends:
     - .test
     - .high-capacity

data/lib/gitlab/qa.rb

@@ -54,7 +54,7 @@ module Gitlab
           autoload :Praefect, 'gitlab/qa/scenario/test/integration/praefect'
           autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'
           autoload :SMTP, 'gitlab/qa/scenario/test/integration/smtp'
-          autoload :GitalyHA, 'gitlab/qa/scenario/test/integration/gitaly_ha'
+          autoload :GitalyCluster, 'gitlab/qa/scenario/test/integration/gitaly_cluster'
           autoload :Jira, 'gitlab/qa/scenario/test/integration/jira'
         end
 

data/lib/gitlab/qa/component/base.rb

@@ -42,6 +42,16 @@ module Gitlab
         end
 
         def instance
+          instance_no_teardown do
+            yield self if block_given?
+          end
+        ensure
+          teardown
+        end
+
+        alias_method :launch_and_teardown_instance, :instance
+
+        def instance_no_teardown
           prepare
           start
           reconfigure
@@ -49,12 +59,8 @@ module Gitlab
           process_exec_commands
 
           yield self if block_given?
-        ensure
-          teardown
         end
 
-        alias_method :launch_and_teardown_instance, :instance
-
         def prepare
           prepare_docker_image
           prepare_network

data/lib/gitlab/qa/docker/command.rb

@@ -4,8 +4,9 @@ module Gitlab
       class Command
         attr_reader :args
 
-        def initialize(cmd = nil)
+        def initialize(cmd = nil, mask_secrets: nil)
           @args = Array(cmd)
+          @mask_secrets = Array(mask_secrets)
         end
 
         def <<(*args)
@@ -28,6 +29,17 @@ module Gitlab
           "docker #{@args.join(' ')}"
         end
 
+        # Returns a masked string form of a Command
+        #
+        # @example
+        #   Command.new('a docker command', mask_secrets: 'command').mask_secrets #=> 'a docker *****'
+        #   Command.new('a docker command', mask_secrets: %w[docker command]).mask_secrets #=> 'a ***** *****'
+        #
+        # @return [String] The masked command string
+        def mask_secrets
+          @mask_secrets.each_with_object(to_s) { |secret, s| s.gsub!(secret, '*****') }
+        end
+
         def ==(other)
           to_s == other.to_s
         end
@@ -36,8 +48,8 @@ module Gitlab
           Docker::Shellout.new(self).execute!(&block)
         end
 
-        def self.execute(cmd, &block)
-          new(cmd).execute!(&block)
+        def self.execute(cmd, mask_secrets: nil, &block)
+          new(cmd, mask_secrets: mask_secrets).execute!(&block)
         end
       end
     end

data/lib/gitlab/qa/docker/engine.rb

@@ -10,7 +10,7 @@ module Gitlab
         end
 
         def login(username:, password:, registry:)
-          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}))
+          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
         end
 
         def pull(image, tag)

data/lib/gitlab/qa/docker/shellout.rb

@@ -10,7 +10,7 @@ module Gitlab
           @command = command
           @output = []
 
-          puts "Docker shell command: `#{@command}`"
+          puts "Docker shell command: `#{@command.mask_secrets}`"
         end
 
         def execute!
@@ -28,7 +28,7 @@ module Gitlab
             end
 
             if wait.value.exited? && wait.value.exitstatus.nonzero?
-              raise StatusError, "Docker command `#{@command}` failed!"
+              raise StatusError, "Docker command `#{@command.mask_secrets}` failed!"
             end
           end
 

data/lib/gitlab/qa/release.rb

@@ -147,14 +147,15 @@ module Gitlab
             registry: DEV_REGISTRY
           }
         elsif omnibus_mirror?
-          username, password = if Runtime::Env.ci_job_token
+          username, password = if Runtime::Env.ci_job_token && Runtime::Env.ci_pipeline_source == 'pipeline'
                                  ['gitlab-ci-token', Runtime::Env.ci_job_token]
+                               elsif Runtime::Env.qa_container_registry_access_token
+                                 [Runtime::Env.gitlab_username, Runtime::Env.qa_container_registry_access_token]
                                else
                                  Runtime::Env.require_qa_access_token!
 
                                  [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
                                end
-
           {
             username: username,
             password: password,

data/lib/gitlab/qa/runtime/env.rb

@@ -38,6 +38,7 @@ module Gitlab
           'SIGNUP_DISABLED' => :signup_disabled,
           'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
+          'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
           'QA_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
           'QA_LOG_PATH' => :qa_log_path,
@@ -112,6 +113,10 @@ module Gitlab
           ENV['CI_JOB_URL']
         end
 
+        def ci_pipeline_source
+          ENV['CI_PIPELINE_SOURCE']
+        end
+
         def ci_project_name
           ENV['CI_PROJECT_NAME']
         end
@@ -148,6 +153,10 @@ module Gitlab
           ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
         end
 
+        def qa_container_registry_access_token
+          ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
+        end
+
         def host_artifacts_dir
           @host_artifacts_dir ||= File.join(ENV['QA_ARTIFACTS_DIR'] || '/tmp/gitlab-qa', Runtime::Env.run_id)
         end

data/lib/gitlab/qa/scenario/test/integration/geo.rb

@@ -27,13 +27,14 @@ module Gitlab
                   gitlab_rails['db_pool'] = 5;
                   gitlab_rails['geo_node_name'] = '#{primary.name}';
                   gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0'];
+                  gitlab_rails['packages_enabled'] = true;
                   postgresql['listen_address'] = '0.0.0.0';
                   postgresql['max_replication_slots'] = 1;
                   postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'];
                   postgresql['sql_user_password'] = 'e1d1469ec5f533651918b4567a3ed1ae';
                   postgresql['trust_auth_cidr_addresses'] = ['0.0.0.0/0','0.0.0.0/0'];
                   sidekiq['concurrency'] = 2;
-                  unicorn['worker_processes'] = 2;
+                  puma['worker_processes'] = 2;
                 OMNIBUS
                 primary.exec_commands = fast_ssh_key_lookup_commands + git_lfs_install_commands
 
@@ -50,11 +51,12 @@ module Gitlab
                       gitlab_rails['db_pool'] = 5;
                       gitlab_rails['geo_node_name'] = '#{secondary.name}';
                       gitlab_rails['monitoring_whitelist'] = ['0.0.0.0/0'];
+                      gitlab_rails['packages_enabled'] = true;
                       postgresql['listen_address'] = '0.0.0.0';
                       postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'];
                       postgresql['sql_user_password'] = 'e1d1469ec5f533651918b4567a3ed1ae';
                       sidekiq['concurrency'] = 2;
-                      unicorn['worker_processes'] = 2;
+                      puma['worker_processes'] = 2;
                     OMNIBUS
                     secondary.exec_commands = fast_ssh_key_lookup_commands + git_lfs_install_commands
 

data/lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb

@@ -0,0 +1,201 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class GitalyCluster < Scenario::Template
+            attr_reader :gitlab_name, :spec_suite
+
+            def initialize
+              @gitlab_name = 'gitlab-gitaly-ha'
+              @primary_node_name = 'gitaly1'
+              @secondary_node_name = 'gitaly2'
+              @tertiary_node_name = 'gitaly3'
+              @praefect_node_name = 'praefect'
+              @database = 'postgres'
+              @spec_suite = 'Test::Integration::GitalyHA'
+              @network = 'test'
+            end
+
+            # rubocop:disable Metrics/AbcSize
+            def perform(release, *rspec_args)
+              gitaly_primary_node = gitaly(@primary_node_name, release)
+              gitaly_secondary_node = gitaly(@secondary_node_name, release)
+              gitaly_tertiary_node = gitaly(@tertiary_node_name, release)
+
+              sql_node = Component::PostgreSQL.new.tap do |sql|
+                sql.name = @database
+                sql.network = @network
+                sql.instance_no_teardown do
+                  sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
+                end
+              end
+
+              praefect_node = Component::Gitlab.new.tap do |praefect|
+                praefect.release = QA::Release.new(release)
+                praefect.name = @praefect_node_name
+                praefect.network = @network
+                praefect.skip_availability_check = true
+
+                praefect.omnibus_config = praefect_omnibus_configuration
+
+                praefect.instance_no_teardown
+              end
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.name = gitlab_name
+                gitlab.network = @network
+
+                gitlab.omnibus_config = gitlab_omnibus_configuration
+                gitlab.instance do
+                  puts "Running Gitaly HA specs!"
+
+                  Component::Specs.perform do |specs|
+                    specs.suite = spec_suite
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            ensure
+              praefect_node&.teardown
+              sql_node&.teardown
+              gitaly_primary_node&.teardown
+              gitaly_secondary_node&.teardown
+              gitaly_tertiary_node&.teardown
+            end
+            # rubocop:enable Metrics/AbcSize
+
+            private
+
+            def disable_other_services
+              <<~OMNIBUS
+                postgresql['enable'] = false;
+                redis['enable'] = false;
+                nginx['enable'] = false;
+                prometheus['enable'] = false;
+                grafana['enable'] = false;
+                puma['enable'] = false;
+                sidekiq['enable'] = false;
+                gitlab_workhorse['enable'] = false;
+                gitlab_rails['rake_cache_clear'] = false;
+                gitlab_rails['auto_migrate'] = false;
+              OMNIBUS
+            end
+
+            def praefect_omnibus_configuration
+              <<~OMNIBUS
+                #{disable_other_services}
+                gitaly['enable'] = false;
+                praefect['enable'] = true;
+                praefect['listen_addr'] = '0.0.0.0:2305';
+                praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
+                praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
+                praefect['database_host'] = '#{@database}.#{@network}';
+                praefect['database_user'] = 'postgres';
+                praefect['database_port'] = 5432;
+                praefect['database_password'] = 'SQL_PASSWORD';
+                praefect['database_dbname'] = 'praefect_production';
+                praefect['database_sslmode'] = 'disable';
+                praefect['postgres_queue_enabled'] = true;
+                praefect['failover_enabled'] = true;
+                praefect['virtual_storages'] = {
+                  'default' => {
+                    '#{@primary_node_name}' => {
+                      'address' => 'tcp://#{@primary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN',
+                      'primary' => true
+                    },
+                    '#{@secondary_node_name}' => {
+                      'address' => 'tcp://#{@secondary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                    },
+                    '#{@tertiary_node_name}' => {
+                      'address' => 'tcp://#{@tertiary_node_name}.#{@network}:8075',
+                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                    }
+                  }
+                };
+              OMNIBUS
+            end
+
+            def gitaly_omnibus_configuration
+              <<~OMNIBUS
+                #{disable_other_services}
+                prometheus['enable'] = true;
+                prometheus_monitoring['enable'] = false;
+                gitaly['enable'] = true;
+                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
+                gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                gitlab_rails['internal_api_url'] = 'http://#{@gitlab_name}.#{@network}';
+                git_data_dirs({
+                  '#{@primary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  },
+                  '#{@secondary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  },
+                  '#{@tertiary_node_name}' => {
+                    'path' => '/var/opt/gitlab/git-data'
+                  }
+                });
+              OMNIBUS
+            end
+
+            def gitlab_omnibus_configuration
+              <<~OMNIBUS
+                external_url 'http://#{@gitlab_name}.#{@network}';
+
+                git_data_dirs({
+                  'default' => {
+                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                  }
+                });
+                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                prometheus['scrape_configs'] = [
+                  {
+                    'job_name' => 'praefect',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@praefect_node_name}.#{@network}:9652'
+                      ]
+                    ]
+                  },
+                  {
+                    'job_name' => 'praefect-gitaly',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@primary_node_name}.#{@network}:9236',
+                        '#{@secondary_node_name}.#{@network}:9236',
+                        '#{@tertiary_node_name}.#{@network}:9236'
+                      ]
+                    ]
+                  }
+                ];
+                grafana['disable_login_form'] = false;
+                grafana['admin_password'] = 'GRAFANA_ADMIN_PASSWORD';
+              OMNIBUS
+            end
+
+            def gitaly(name, release)
+              Component::Gitlab.new.tap do |gitaly|
+                gitaly.release = QA::Release.new(release)
+                gitaly.name = name
+                gitaly.network = @network
+                gitaly.skip_availability_check = true
+                gitaly.omnibus_config = gitaly_omnibus_configuration
+                gitaly.instance_no_teardown
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.15.0'.freeze
+    VERSION = '5.16.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 5.16.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -284,7 +284,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
-- lib/gitlab/qa/scenario/test/integration/gitaly_ha.rb
+- lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb

data/lib/gitlab/qa/scenario/test/integration/gitaly_ha.rb

@@ -1,166 +0,0 @@
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class GitalyHA < Scenario::Template
-            attr_reader :gitlab_name, :spec_suite
-
-            def initialize
-              @gitlab_name = 'gitlab-gitaly-ha'
-              @primary_node = 'gitaly1'
-              @secondary_node = 'gitaly2'
-              @praefect_node = 'praefect'
-              @database = 'postgres'
-              @spec_suite = 'Test::Integration::GitalyHA'
-              @network = 'test'
-            end
-
-            # rubocop:disable Metrics/AbcSize
-            def perform(release, *rspec_args)
-              gitaly(@primary_node, release) do
-                gitaly(@secondary_node, release) do
-                  Component::PostgreSQL.perform do |sql|
-                    sql.name = @database
-                    sql.network = @network
-
-                    sql.instance do
-                      sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
-
-                      Component::Gitlab.perform do |praefect|
-                        praefect.release = QA::Release.new(release)
-                        praefect.name = @praefect_node
-                        praefect.network = @network
-                        praefect.skip_availability_check = true
-
-                        praefect.omnibus_config = praefect_omnibus_configuration
-
-                        praefect.instance do
-                          Component::Gitlab.perform do |gitlab|
-                            gitlab.release = QA::Release.new(release)
-                            gitlab.name = gitlab_name
-                            gitlab.network = @network
-
-                            gitlab.omnibus_config = gitlab_omnibus_configuration
-                            gitlab.instance do
-                              puts "Running Gitaly HA specs!"
-
-                              Component::Specs.perform do |specs|
-                                specs.suite = spec_suite
-                                specs.release = gitlab.release
-                                specs.network = gitlab.network
-                                specs.args = [gitlab.address, *rspec_args]
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-            # rubocop:enable Metrics/AbcSize
-
-            private
-
-            def disable_other_services
-              <<~OMNIBUS
-                postgresql['enable'] = false;
-                redis['enable'] = false;
-                nginx['enable'] = false;
-                prometheus['enable'] = false;
-                grafana['enable'] = false;
-                unicorn['enable'] = false;
-                sidekiq['enable'] = false;
-                gitlab_workhorse['enable'] = false;
-                gitlab_rails['rake_cache_clear'] = false;
-                gitlab_rails['auto_migrate'] = false;
-              OMNIBUS
-            end
-
-            def praefect_omnibus_configuration
-              <<~OMNIBUS
-                #{disable_other_services}
-                gitaly['enable'] = false;
-                praefect['enable'] = true;
-                praefect['listen_addr'] = '0.0.0.0:2305';
-                praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
-                praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
-                praefect['database_host'] = '#{@database}.#{@network}';
-                praefect['database_user'] = 'postgres';
-                praefect['database_port'] = 5432;
-                praefect['database_password'] = 'SQL_PASSWORD';
-                praefect['database_dbname'] = 'praefect_production';
-                praefect['database_sslmode'] = 'disable';
-                praefect['postgres_queue_enabled'] = true;
-                praefect['failover_enabled'] = true;
-                praefect['virtual_storages'] = {
-                  'default' => {
-                    '#{@primary_node}' => {
-                      'address' => 'tcp://#{@primary_node}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN',
-                      'primary' => true
-                    },
-                    '#{@secondary_node}' => {
-                      'address' => 'tcp://#{@secondary_node}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    }
-                  }
-                };
-              OMNIBUS
-            end
-
-            def gitaly_omnibus_configuration
-              <<~OMNIBUS
-                #{disable_other_services}
-                prometheus_monitoring['enable'] = false;
-                gitaly['enable'] = true;
-                gitaly['listen_addr'] = '0.0.0.0:8075';
-                gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
-                gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
-                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
-                gitlab_rails['internal_api_url'] = 'http://#{@gitlab_name}.#{@network}';
-                git_data_dirs({
-                  '#{@primary_node}' => {
-                    'path' => '/var/opt/gitlab/git-data'
-                  },
-                  '#{@secondary_node}' => {
-                    'path' => '/var/opt/gitlab/git-data'
-                  }
-                });
-              OMNIBUS
-            end
-
-            def gitlab_omnibus_configuration
-              <<~OMNIBUS
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://#{@praefect_node}.#{@network}:2305',
-                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
-                  }
-                });
-                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
-              OMNIBUS
-            end
-
-            def gitaly(name, release)
-              Component::Gitlab.perform do |gitaly|
-                gitaly.release = QA::Release.new(release)
-                gitaly.name = name
-                gitaly.network = @network
-                gitaly.skip_availability_check = true
-
-                gitaly.omnibus_config = gitaly_omnibus_configuration
-
-                gitaly.instance do
-                  yield self
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end