gitlab-qa 5.9.0 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd97ce9a6062883099379592097771554a0d5d832cf4a3a120e73ef5808a31d
-  data.tar.gz: 171854be80b7576152c6d5324eb404e17ee825b7f58fe01e3f2790cd0208efab
+  metadata.gz: 391e977cce68dfe2121221a474f716594ba841f639e49b9c0e4e37f273141b0c
+  data.tar.gz: af9e8913c4ecfe5d365ba18222f1dd15a0370c2efaed6d94c91af89b0dcd5e3e
 SHA512:
-  metadata.gz: 514c8f72a97243719ebd46cf586076f1c996c45de222f6e7ce9690270b8a7c6e16785f81e82a74b2b208571edae8b5dcf7fd79ab0047ccb43938849ad3d81ae8
-  data.tar.gz: 8bf6ec756fcd9f9d4175b6887db7fb962242bb5c77bd949028a62844fd7e41f2f4320055fb54d9a87a4334a2d4095a17516e9f75d2e2d52f7938ee7399f8dcbc
+  metadata.gz: 13946f0f1404490edff6465ca7e46a1e748e6cffc2d742e6fd9eb0c20f9ebbcf4c36217f863c07d21a3be622c2e4d45734ae3810b098ead1e1cad0dbdfbde9bc
+  data.tar.gz: b52d3e85cde22d8aa4819f4597e5146b7629287daeafda81bcf168e22cd833c2b7e3db5b1936503df2f3c4fbcdf20b87955c2d8bdcc084cf8e8d5076f13fd56a

data/lib/gitlab/qa.rb

@@ -51,6 +51,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'
         end
 
         module Sanity
@@ -71,6 +72,7 @@ module Gitlab
       autoload :Preprod, 'gitlab/qa/component/preprod'
       autoload :Elasticsearch, 'gitlab/qa/component/elasticsearch'
       autoload :MailHog, 'gitlab/qa/component/mail_hog'
+      autoload :PostgreSQL, 'gitlab/qa/component/postgresql'
     end
 
     module Support

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

@@ -13,7 +13,7 @@ module Gitlab
 
         attr_reader :release, :docker
         attr_accessor :volumes, :network, :environment, :tls, :disable_animations
-        attr_writer :name, :relative_path, :exec_commands
+        attr_writer :name, :relative_path, :exec_commands, :skip_check
 
         def_delegators :release, :tag, :image, :edition
 
@@ -26,6 +26,7 @@ module Gitlab
           @volumes = {}
           @network_aliases = []
           @disable_animations = true
+          @skip_check = false
 
           @volumes[CERTIFICATES_PATH] = SSL_PATH
 
@@ -87,7 +88,7 @@ module Gitlab
           prepare
           start
           reconfigure
-          wait
+          wait unless @skip_check
           process_exec_commands
 
           yield self if block_given?
@@ -98,11 +99,23 @@ module Gitlab
         alias_method :launch_and_teardown_instance, :instance
 
         def prepare
+          prepare_gitlab_omnibus_config
+          prepare_docker_image
+          prepare_network
+        end
+
+        def prepare_gitlab_omnibus_config
           setup_disable_animations if disable_animations
           set_formless_login_token
+        end
 
-          @docker.pull(image, tag) unless Runtime::Env.skip_pull?
+        def prepare_docker_image
+          return if Runtime::Env.skip_pull?
+
+          @docker.pull(image, tag)
+        end
 
+        def prepare_network
           return if @docker.network_exists?(network)
 
           @docker.network_create(network)

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

@@ -0,0 +1,72 @@
+module Gitlab
+  module QA
+    module Component
+      class PostgreSQL
+        include Scenario::Actable
+
+        POSTGRES_IMAGE = 'postgres'.freeze
+        POSTGRES_IMAGE_TAG = '11'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
+
+        def name
+          @name ||= "postgres"
+        end
+
+        def instance
+          prepare
+          start
+          wait_until_ready
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
+        def start
+          @docker.run(POSTGRES_IMAGE, POSTGRES_IMAGE_TAG) do |command|
+            command << "-d"
+            command << "--name #{name}"
+            command << "--net #{network}"
+
+            command.env("POSTGRES_PASSWORD", "SQL_PASSWORD")
+          end
+        end
+
+        def teardown
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
+        def run_psql(command)
+          @docker.exec(name, %(psql -U postgres #{command}))
+        end
+
+        private
+
+        def wait_until_ready
+          start = Time.now
+          begin
+            run_psql 'template1'
+          rescue StandardError
+            retry if Time.now - start < 30
+            raise
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,166 @@
+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 = Release.new(release)
+                        praefect.name = @praefect_node
+                        praefect.network = @network
+                        praefect.skip_check = true
+
+                        praefect.omnibus_config = praefect_omnibus_configuration
+
+                        praefect.instance do
+                          Component::Gitlab.perform do |gitlab|
+                            gitlab.release = 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 = Release.new(release)
+                gitaly.name = name
+                gitaly.network = @network
+                gitaly.skip_check = true
+
+                gitaly.omnibus_config = gitaly_omnibus_configuration
+
+                gitaly.instance do
+                  yield self
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Gitlab
                   gitlab.volumes = volumes
                   gitlab.exec_commands = ['gitlab-psql -d template1 -c "CREATE DATABASE praefect_production OWNER gitlab"']
 
-                  gitlab.act(omnibus_config_with_praefect) do |new_config|
+                  gitlab.act do
                     prepare
                     start
                     reconfigure
@@ -34,6 +34,7 @@ module Gitlab
                   gitlab.omnibus_config = omnibus_config_with_praefect
 
                   gitlab.act do
+                    prepare_gitlab_omnibus_config
                     start
                     reconfigure
                     wait

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.9.0'.freeze
+    VERSION = '5.10.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.10.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -243,6 +243,7 @@ files:
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/mail_hog.rb
 - lib/gitlab/qa/component/minio.rb
+- lib/gitlab/qa/component/postgresql.rb
 - lib/gitlab/qa/component/preprod.rb
 - lib/gitlab/qa/component/production.rb
 - lib/gitlab/qa/component/saml.rb
@@ -277,6 +278,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/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/kubernetes.rb
@@ -321,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab