gitlab-qa 5.13.7 → 5.17.0

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

@@ -13,7 +13,11 @@ module Gitlab
                   gitlab.name = 'gitlab'
                   gitlab.network = 'test'
                   gitlab.volumes = volumes
-                  gitlab.exec_commands = ['gitlab-psql -d template1 -c "CREATE DATABASE praefect_production OWNER gitlab"']
+                  gitlab.exec_commands = [
+                    'gitlab-psql -d template1 -c "CREATE DATABASE praefect_production OWNER gitlab"',
+                    'mkdir -p /var/opt/gitlab/git-data/repositories/praefect',
+                    'chown -R git:root /var/opt/gitlab/git-data/repositories'
+                  ]
 
                   gitlab.act do
                     prepare
@@ -21,7 +25,7 @@ module Gitlab
                     reconfigure
                     process_exec_commands
                     wait
-                    teardown
+                    teardown!
                   end
                 end
 
@@ -61,21 +65,25 @@ module Gitlab
             def omnibus_config_with_praefect
               <<~OMNIBUS
                 gitaly['enable'] = true;
-                gitaly['auth_token'] = 'praefect-gitaly-token';
+                gitaly['auth_token'] = 'secret-token';
                 gitaly['storage'] = [
                   {
                     'name' => 'praefect-gitaly-0',
-                    'path' => '/var/opt/gitlab/git-data/repositories'
+                    'path' => '/var/opt/gitlab/git-data/repositories/praefect'
+                  },
+                  {
+                    'name' => 'gitaly',
+                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
                   }
                 ];
                 praefect['enable'] = true;
                 praefect['listen_addr'] = '0.0.0.0:2305';
-                praefect['auth_token'] = 'praefect-token';
+                praefect['auth_token'] = 'secret-token';
                 praefect['virtual_storages'] = {
                   'default' => {
                     'praefect-gitaly-0' => {
                       'address' => 'unix:/var/opt/gitlab/gitaly/gitaly.socket',
-                      'token'   => 'praefect-gitaly-token',
+                      'token'   => 'secret-token',
                       'primary' => true
                     }
                   }
@@ -84,10 +92,13 @@ module Gitlab
                 praefect['database_user'] = 'gitlab';
                 praefect['database_dbname'] = 'praefect_production';
                 praefect['postgres_queue_enabled'] = true;
-                gitlab_rails['gitaly_token'] = 'praefect-token';
+                gitlab_rails['gitaly_token'] = 'secret-token';
                 git_data_dirs({
                   'default' => {
                     'gitaly_address' => 'tcp://localhost:2305'
+                  },
+                  'gitaly' => {
+                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
                   }
                 });
               OMNIBUS

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -24,7 +24,7 @@ module Gitlab
                 end
               end
 
-              project = "gitlab-org/#{QA::Release.new(release).project_name}"
+              project = "gitlab-org/#{QA::Release.new(release).api_project_name}"
               commit = recent_commits(project).find { |c| c['id'] == version }
 
               if commit

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.13.7'.freeze
+    VERSION = '5.17.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.13.7
+  version: 5.17.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -269,6 +269,7 @@ files:
 - lib/gitlab/qa/scenario/actable.rb
 - lib/gitlab/qa/scenario/cli_commands.rb
 - lib/gitlab/qa/scenario/template.rb
+- lib/gitlab/qa/scenario/test/instance/airgapped.rb
 - lib/gitlab/qa/scenario/test/instance/any.rb
 - lib/gitlab/qa/scenario/test/instance/deployment_base.rb
 - lib/gitlab/qa/scenario/test/instance/geo.rb
@@ -283,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