gitlab-qa 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e21cf41df3ce08ca8f471d140f99bb4fdfc81c03079ec99d365ef31a219a5eb
-  data.tar.gz: 24b85de9e9e754ea6240c7b7d03592f92a9862edc143a174f59dad4362504cc5
+  metadata.gz: f5a314d23803f87dbaae80b80dc127fd6c285acf540f48d3feb8dd78038d4d1d
+  data.tar.gz: 49e24a262489cbd18e7105af26847e3ac4deec62c1d06a64191c65f86d9176f4
 SHA512:
-  metadata.gz: 03d58938bb2d0462bf7d471ee0e2fa5bb20187d0925ac6b5a29f86a6416d832249f02207c67aa9b9f72f211e268eb246c825f6129040bd7c2423287f7feefcbf
-  data.tar.gz: d04ebe15f0844dcb7eaa960b4621c50d878d7cbc745558d49dd658ca8e95e881d4ac6ccc24b476ea5b37212107803fa90883c61bedd9d441bac520de03cf0f5c
+  metadata.gz: 4de75cf6f4fdee481c2b0b8d4c38d11d79e86fda4ac0eb00620efa525a7fe87f03c1c1cd338c52edcb05e133a2dc52a884b5e45a9c64395c7707f8d6e49d89eb
+  data.tar.gz: 92361b1e9c8044c79beb7952bf71a54194a3071eec3883648d963de74f73efbc316f1daf23125821299772356d54d99d301c5838d6b4bc6253cdfeaf375917ca

data/.gitlab-ci.yml

@@ -775,6 +775,46 @@ ee:packages-quarantine:
     GITLAB_QA_OPTS: "--omnibus-config packages"
     QA_RSPEC_TAGS: "--tag quarantine --tag packages"
 
+ce:registry:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  allow_failure: true
+  variables:
+    QA_SCENARIO: "Test::Integration::Registry"
+
+ce:registry-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Registry"
+
+ee:registry:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  allow_failure: true
+  variables:
+    QA_SCENARIO: "Test::Integration::Registry"
+
+ee:registry-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Registry"
+
 ce:actioncable:
   extends:
     - .test

data/docs/what_tests_can_be_run.md

@@ -73,6 +73,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_SLOW_CONNECTION_LATENCY_MS` | `2000` | The additional latency (in ms) of the simulated slow connection. | No|
 | `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` | `32` | The maximum throughput (in kbps) of the simulated slow connection. | No|
 | `QA_SKIP_PULL` | `false` | Set to `true` to skip pulling docker images (e.g., to use one you built locally). | No|
+| `QA_GENERATE_ALLURE_REPORT` | `false` | When running on CI, set to `true` to generate allure reports | No|
 | `GITHUB_USERNAME` |-  | Username for authenticating with GitHub. | No|
 | `GITHUB_PASSWORD` |-  | Password for authenticating with GitHub. | No|
 | `GITLAB_QA_LOOP_RUNNER_MINUTES` | `1` | Minutes to run and repeat a spec while using the '--loop' option; default value is 1 minute. | No|
@@ -86,8 +87,6 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `GITLAB_QA_USER_AGENT` |- | The browser user-agent to use instead of the default Chrome user-agent. | No|
 | `GEO_FAILOVER` | `false` | Set to `true` when a Geo secondary site has been promoted to a Geo primary site. | No|
 | `GITLAB_INITIAL_ROOT_PASSWORD` | `5iveL!fe` | Initial root password for Omnibus installations | No|
-| `GENERATE_ALLURE_REPORT` | `false` | When running on CI, set to `true` to generate allure reports | No|
-
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 

data/lib/gitlab/qa.rb

@@ -65,6 +65,7 @@ module Gitlab
           autoload :Jira, 'gitlab/qa/scenario/test/integration/jira'
           autoload :SSHTunnel, 'gitlab/qa/scenario/test/integration/ssh_tunnel'
           autoload :MTLS, 'gitlab/qa/scenario/test/integration/mtls'
+          autoload :ClientSSL, 'gitlab/qa/scenario/test/integration/client_ssl'
         end
 
         module Sanity

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

@@ -65,7 +65,7 @@ module Gitlab
         end
 
         def port
-          tls ? '443' : '80'
+          tls ? '443:443' : '80'
         end
 
         def gitaly_tls

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

@@ -54,6 +54,7 @@ module Gitlab
           'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
           'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
           'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,
+          'QA_GENERATE_ALLURE_REPORT' => :generate_allure_report,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
@@ -91,8 +92,7 @@ module Gitlab
           'DEPLOY_VERSION' => :deploy_version,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GEO_FAILOVER' => :geo_failover,
-          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
-          'GENERATE_ALLURE_REPORT' => :generate_allure_report
+          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|

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

@@ -0,0 +1,65 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class ClientSSL < Scenario::Template
+            def initialize
+              @gitlab_name = 'gitlab'
+              @spec_suite = 'Test::Instance::All'
+              @network = 'test'
+              @env = {}
+              @tag = 'client_ssl'
+            end
+
+            # rubocop:disable Metrics/AbcSize
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.name = @gitlab_name
+                gitlab.network = @network
+                gitlab.skip_availability_check = true
+
+                gitlab.omnibus_configuration << gitlab_omnibus
+
+                gitlab.tls = true
+
+                gitlab.instance do
+                  puts 'Running Client SSL specs!'
+
+                  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
+            end
+            # rubocop:enable Metrics/AbcSize
+
+            def gitlab_omnibus
+              <<~OMNIBUS
+                external_url 'https://#{@gitlab_name}.#{@network}';
+                letsencrypt['enable'] = false;
+
+                nginx['ssl_certificate'] = '/etc/gitlab/ssl/gitlab.test.crt';
+                nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/gitlab.test.key';
+
+                nginx['ssl_verify_client'] = 'on';
+                nginx['ssl_client_certificate'] = '/etc/gitlab/authority/ca.pem';
+                nginx['ssl_verify_depth'] = '2';
+              OMNIBUS
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.3.0'.freeze
+    VERSION = '7.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -299,6 +299,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging.rb
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/integration/actioncable.rb
+- lib/gitlab/qa/scenario/test/integration/client_ssl.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb