gitlab-qa 6.4.1 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156602d47187662c86a6cdf07d6e737cdf8083c1098a411dc612ffbdaeb0f5fc
-  data.tar.gz: f0678a3a1587fbe094ecb3804b2d4a3e6b040ee27e2c7dc766c9b9a1f3495341
+  metadata.gz: 97ec064795e04d091b6d04bff27d6c163635a1a08d1e9b28efedf17111f2b1a6
+  data.tar.gz: 8318fb6919671c0af482d9dda37f751d15d60732b6654eca890fd87118f9f8d3
 SHA512:
-  metadata.gz: 4def52124e2d59910e64c29699b55faabd46e29bca5030938ecd93aec69b638fb855a6943ffaad91ede0c98d012b47fedbb6f340cbf74188cb1cf1386d2d136b
-  data.tar.gz: 92fca187c1845867f066921c3ff7718de149043526c5f85f6108db4053554b993e85c8f382c084cd49a20f1198c0456c89ea067182d9d0ade2a43801a2e7b382
+  metadata.gz: dcc298d8f343ee158a4e1229748a96853555082f20de96ed3b5851e413fdc47a832eebd9d0f27f8aba959aacdcbd28c0409beea9abbf8ca7a8feeb18cc066171
+  data.tar.gz: 8bdf4528158b4f5c5f09bb87f4604dc3eda02c73d98a064714375f24f0e245c636fefb5a6e5b2f7c93db8d46053b5ebeb7eb3821fd17ae8c04eb459f8c0154fd

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/mast
 - Checklist after merging:
   - [ ] [Create a tag for the new release version](docs/release_process.md#how-to).
 
-/label ~Quality ~backstage
+/label ~Quality ~"feature::maintenance"

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

@@ -30,7 +30,8 @@ module Gitlab
           begin
             run_psql 'template1'
           rescue StandardError
-            retry if Time.now - start < 30
+            sleep 5
+            retry if Time.now - start < 60
             raise
           end
         end

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

@@ -15,6 +15,8 @@ module Gitlab
               @database = 'postgres'
               @spec_suite = 'Test::Instance::All'
               @network = 'test'
+              @env = {}
+              @tag = 'gitaly_cluster'
             end
 
             # rubocop:disable Metrics/AbcSize
@@ -51,14 +53,17 @@ module Gitlab
                 gitlab.instance do
                   puts "Running Gitaly Cluster specs!"
 
-                  rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag gitaly_cluster]
+                  if @tag
+                    rspec_args << "--" unless rspec_args.include?('--')
+                    rspec_args << "--tag" << @tag
+                  end
 
                   Component::Specs.perform do |specs|
                     specs.suite = spec_suite
                     specs.release = gitlab.release
                     specs.network = gitlab.network
                     specs.args = [gitlab.address, *rspec_args]
+                    specs.env = @env
                   end
                 end
               end

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

@@ -3,105 +3,62 @@ module Gitlab
     module Scenario
       module Test
         module Integration
-          class Praefect < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
-            def perform(release, *rspec_args)
-              Docker::Volumes.new.with_temporary_volumes do |volumes|
-                # Create the Praefect database before enabling Praefect
-                Component::Gitlab.perform do |gitlab|
-                  gitlab.release = QA::Release.new(release)
-                  gitlab.name = 'gitlab'
-                  gitlab.network = 'test'
-                  gitlab.volumes = volumes
-                  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'
-                  ]
+          class Praefect < GitalyCluster
+            attr_reader :gitlab_name, :spec_suite
 
-                  gitlab.act do
-                    prepare
-                    start
-                    reconfigure
-                    process_exec_commands
-                    wait_until_ready
-                    teardown!
-                  end
-                end
+            def initialize
+              super
 
-                # Restart GitLab with Praefect enabled and then run the tests
-                Component::Gitlab.perform do |gitlab|
-                  gitlab.release = QA::Release.new(release)
-                  gitlab.name = 'gitlab'
-                  gitlab.network = 'test'
-                  gitlab.volumes = volumes
-                  gitlab.omnibus_config = omnibus_config_with_praefect
-
-                  gitlab.act do
-                    prepare_gitlab_omnibus_config
-                    start
-                    reconfigure
-                    wait_until_ready
-
-                    puts "Running Praefect specs!"
-
-                    Component::Specs.perform do |specs|
-                      specs.suite = 'Test::Instance::All'
-                      specs.release = gitlab.release
-                      specs.network = gitlab.network
-                      specs.args = [gitlab.address, *rspec_args]
-                      specs.env = { QA_PRAEFECT_REPOSITORY_STORAGE: 'default' }
-                    end
-
-                    teardown
-                  end
-                end
-              end
+              @tag = nil
+              @env = { QA_PRAEFECT_REPOSITORY_STORAGE: 'default' }
             end
-            # rubocop:enable Metrics/AbcSize
-
-            private
 
-            def omnibus_config_with_praefect
+            def gitlab_omnibus_configuration
               <<~OMNIBUS
-                gitaly['enable'] = true;
+                external_url 'http://#{@gitlab_name}.#{@network}';
+
+                git_data_dirs({
+                  'default' => {
+                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
+                  },
+                  'gitaly' => {
+                    'gitaly_address' => 'tcp://#{@gitlab_name}.#{@network}:8075',
+                    'path' => '/var/opt/gitlab/git-data'
+                  }
+                });
                 gitaly['listen_addr'] = '0.0.0.0:8075';
                 gitaly['auth_token'] = 'secret-token';
                 gitaly['storage'] = [
-                  {
-                    'name' => 'praefect-gitaly-0',
-                    'path' => '/var/opt/gitlab/git-data/repositories/praefect'
-                  },
                   {
                     'name' => 'gitaly',
-                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
+                    'path' => '/var/opt/gitlab/git-data/repositories'
                   }
                 ];
-                praefect['enable'] = true;
-                praefect['listen_addr'] = '0.0.0.0:2305';
-                praefect['auth_token'] = 'secret-token';
-                praefect['virtual_storages'] = {
-                  'default' => {
-                    'praefect-gitaly-0' => {
-                      'address' => 'tcp://localhost:8075',
-                      'token'   => 'secret-token',
-                      'primary' => true
-                    }
-                  }
-                };
-                praefect['database_host'] = '/var/opt/gitlab/postgresql';
-                praefect['database_user'] = 'gitlab';
-                praefect['database_dbname'] = 'praefect_production';
-                praefect['postgres_queue_enabled'] = true;
                 gitlab_rails['gitaly_token'] = 'secret-token';
-                git_data_dirs({
-                  'default' => {
-                    'gitaly_address' => 'tcp://localhost:2305'
+                gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
+                prometheus['scrape_configs'] = [
+                  {
+                    'job_name' => 'praefect',
+                    'static_configs' => [
+                      'targets' => [
+                        '#{@praefect_node_name}.#{@network}:9652'
+                      ]
+                    ]
                   },
-                  'gitaly' => {
-                    'path' => '/var/opt/gitlab/git-data/repositories/gitaly'
+                  {
+                    '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
           end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.4.1'.freeze
+    VERSION = '6.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control