gitlab-qa 7.11.0 → 7.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b2d093e79466c451d4dcd631006b2837be1af4a2ded8e90fc223cdbf90ac5a
-  data.tar.gz: fe671dab02093263ebd86a4d93247a9cc7f1f577e7420e73e0895d7310f9fb7b
+  metadata.gz: 6b9dcb4935c0cc27ed0c101098a6ef19a63db8697aec420844b499b614190669
+  data.tar.gz: fff48c4b8887be1b5915885bf6698d1b34c289c794dafab5d12f63ce1ec52262
 SHA512:
-  metadata.gz: 94974ea4b47eba1e9ac585ab1e0673cb28d20bdb8b001d352c1a75032c649d799298833e58fde198e23efd219ad540064637d5cedc7b0af3d82d34d3cc6a7e24
-  data.tar.gz: bcac709cdb6bf3e1edef0a12946c4d790889aa4552c586d8173168db58791b93dd1c2ccacd69aada711f835a68807e83f48aba006654fca3e46fc81351a64018
+  metadata.gz: 98c19eeafde92cb7931460363ef0f29ee664af8e7e74ff22840b43b797ae24cac0adb3511c395810f33d017d0af3f3aa4618739a58f3cc111aed2046a8c04afc
+  data.tar.gz: c18900856b311a2a8f49260620684f276f69bf2dab35c0fdc1befe41572a1f92b549f00798646fb6c50b1d8fc9d578cc59721978cd5459a3bb45307dabf79919

data/.gitlab-ci.yml

@@ -756,13 +756,50 @@ ee:packages-quarantine:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config packages"
     QA_RSPEC_TAGS: "--tag quarantine --tag packages"
 
+ce:object_storage_registry_tls:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
+
+ce:object_storage_registry_tls-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
+
+ee:object_storage_registry_tls:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
+
+ee:object_storage_registry_tls-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
+
 ce:registry:
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
-  allow_failure: true
   variables:
     QA_SCENARIO: "Test::Integration::Registry"
 
@@ -782,7 +819,6 @@ ee:registry:
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
-  allow_failure: true
   variables:
     QA_SCENARIO: "Test::Integration::Registry"
 

data/lib/gitlab/qa/runtime/omnibus_configurations/registry_object_storage.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class RegistryObjectStorage < Default
+          def configuration
+            Runtime::Env.require_aws_s3_environment!
+
+            <<~OMNIBUS
+              registry['storage'] = { 's3' => { 'accesskey' => '#{Runtime::Env.aws_s3_key_id}', 'secretkey' => '#{Runtime::Env.aws_s3_access_key}', 'bucket' => '#{Runtime::Env.aws_s3_bucket_name}', 'region' => '#{Runtime::Env.aws_s3_region}' } }
+            OMNIBUS
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -99,6 +99,7 @@ module Gitlab
                 praefect['listen_addr'] = '0.0.0.0:2305';
                 praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
                 praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
+                praefect['reconciliation_scheduling_interval'] = '10s';
                 praefect['database_host'] = '#{@database}.#{@network}';
                 praefect['database_user'] = 'postgres';
                 praefect['database_port'] = 5432;

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

@@ -11,19 +11,10 @@ module Gitlab
                 gitlab.release = release
                 gitlab.network = 'test'
                 gitlab.name = 'gitlab'
-                gitlab.tls = true
 
                 gitlab.omnibus_configuration << <<~OMNIBUS
-                  external_url 'https://#{gitlab.name}.#{gitlab.network}';
-                  registry_external_url 'https://#{gitlab.name}.#{gitlab.network}:5050';
-
-                  letsencrypt['enable'] = false;
-
-                  nginx['redirect_http_to_https'] = true;
-                  nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
-                  nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
-                  registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
-                  registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
+                  external_url 'http://#{gitlab.name}.#{gitlab.network}';
+                  registry_external_url 'http://#{gitlab.name}.#{gitlab.network}:5050';
                 OMNIBUS
 
                 gitlab.instance do

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class RegistryTLS < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+                gitlab.name = 'gitlab'
+                gitlab.tls = true
+
+                gitlab.omnibus_configuration << <<~OMNIBUS
+                  external_url 'https://#{gitlab.name}.#{gitlab.network}';
+                  registry_external_url 'https://#{gitlab.name}.#{gitlab.network}:5050';
+
+                  letsencrypt['enable'] = false;
+
+                  nginx['redirect_http_to_https'] = true;
+                  nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
+                  nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
+                  registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
+                  registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
+                OMNIBUS
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::RegistryTLS'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.11.0'.freeze
+    VERSION = '7.12.0'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -17,6 +17,7 @@ module Gitlab
         autoload :ObjectStorageAws, 'gitlab/qa/runtime/omnibus_configurations/object_storage_aws'
         autoload :ObjectStorageGcs, 'gitlab/qa/runtime/omnibus_configurations/object_storage_gcs'
         autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
+        autoload :RegistryObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/registry_object_storage'
       end
     end
 
@@ -69,6 +70,7 @@ module Gitlab
           autoload :MTLS, 'gitlab/qa/scenario/test/integration/mtls'
           autoload :ClientSSL, 'gitlab/qa/scenario/test/integration/client_ssl'
           autoload :Registry, 'gitlab/qa/scenario/test/integration/registry'
+          autoload :RegistryTLS, 'gitlab/qa/scenario/test/integration/registry_tls'
         end
 
         module Sanity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.11.0
+  version: 7.12.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -268,6 +268,7 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/registry_object_storage.rb
 - lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb
 - lib/gitlab/qa/scenario/actable.rb
@@ -303,6 +304,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/mtls.rb
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
 - lib/gitlab/qa/scenario/test/integration/registry.rb
+- lib/gitlab/qa/scenario/test/integration/registry_tls.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
 - lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb