gitlab-qa 7.1.1 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5123ddb14b12e07dd4dd308c296ab59ea2fbcee5667a746cea01fee670724a5
-  data.tar.gz: bdb9b30348b58f194a6c5b989708204153c10d79f3493d1ed28e7f28207879dc
+  metadata.gz: 90a45272bad7c2502b55c9470d0e02410f24db1b36e8e2aec174f8dc93982775
+  data.tar.gz: f6bf58c6f801057533c9dc6078254134bff4087131801cfc69609391c3bba38e
 SHA512:
-  metadata.gz: 5ceff844a2112e50ded2f2080a37cf0803e1f6a163a9a89746751ec4437b20d0faeea2ec825db7588ab25bac4c2feef09db08b1813177dd30a1cce63dc8355d0
-  data.tar.gz: 415df609065a85772c20bdebc860da459fcdcdab61bd12fdfb412af700355fc49101e597c146285cc0e4822f3a4612a75e5368e0180cddeb2a980ca76453f9d0
+  metadata.gz: d0a99b85b682ac45ba5d1f7252fe61aad5156a21c7b17a7139f3ed1d7a0ff90e4252c7ccd056a6979857a663e27aa69b5167f79c9fd2ef7113311d93d283fa45
+  data.tar.gz: 05c9363dd2fad783a7c162bdbe21924bf763365f5665e35835b468a56400158e6e981e3a3fd0733a3a8915683798cea2c5ff5c429c2edc7fd516dafd15a11f51

data/.gitlab-ci.yml

@@ -65,7 +65,7 @@ rspec:
 .test:
   stage: test
   services:
-    - docker:19.03.0-dind
+    - docker:20.10.5-dind
   tags:
     - gitlab-org
     - docker
@@ -370,7 +370,7 @@ ee:update:
     - .ee-qa
     - .rspec-report-opts
     - .knapsack-variables
-  parallel: 5
+  parallel: 10
 
 ee:update-quarantine:
   script:
@@ -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
@@ -1039,7 +1079,7 @@ relate_test_failures:
 
 .notify_upstream_commit:
   stage: notify
-  image: ruby:2.6
+  image: ruby:3.0-alpine
   before_script:
     - gem install gitlab --no-document
 

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|
@@ -87,7 +88,6 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `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|
 
-
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
 ## Running tests with a feature flag enabled

data/lib/gitlab/qa.rb

@@ -14,6 +14,7 @@ module Gitlab
         autoload :Default, 'gitlab/qa/runtime/omnibus_configurations/default'
         autoload :Packages, 'gitlab/qa/runtime/omnibus_configurations/packages'
         autoload :ObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/object_storage'
+        autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
       end
     end
 
@@ -57,8 +58,6 @@ module Gitlab
           autoload :InstanceSAML, 'gitlab/qa/scenario/test/integration/instance_saml'
           autoload :Mattermost, 'gitlab/qa/scenario/test/integration/mattermost'
           autoload :Kubernetes, 'gitlab/qa/scenario/test/integration/kubernetes'
-          autoload :ObjectStorage, 'gitlab/qa/scenario/test/integration/object_storage'
-          autoload :Packages, 'gitlab/qa/scenario/test/integration/packages'
           autoload :Praefect, 'gitlab/qa/scenario/test/integration/praefect'
           autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'
           autoload :SMTP, 'gitlab/qa/scenario/test/integration/smtp'
@@ -66,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/report/generate_test_session.rb

@@ -191,7 +191,9 @@ module Gitlab
           text = tests_with_same_testcase.map(&:name).uniq.join(', ')
 
           if testcase && !passed
-            "[#{text}](#{testcase})"
+            # Workaround for reducing system notes on testcase issues
+            # The first regex extracts the link to the issues list page from a link to a single issue show page by removing the issue id.
+            "[#{text}](#{testcase.match(%r{[\s\S]+\/[^\/\d]+})}?state=opened&search=#{text}) (testcase_id=#{testcase.match(/\d+/)})"
           else
             text
           end

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,
@@ -106,7 +107,7 @@ module Gitlab
         end
 
         def default_branch
-          ENV['QA_DEFAULT_BRANCH'] || 'master'
+          ENV['QA_DEFAULT_BRANCH'] || 'main'
         end
 
         def gitlab_availability_timeout

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class LicenseMode < Default
+          def configuration
+            <<~OMNIBUS
+              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => 'https://customers.stg.gitlab.com' }
+            OMNIBUS
+          end
+        end
+      end
+    end
+  end
+end

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/scenario/test/integration/gitaly_cluster.rb

@@ -109,6 +109,7 @@ module Gitlab
                 praefect['database_sslmode'] = 'disable';
                 praefect['postgres_queue_enabled'] = true;
                 praefect['failover_enabled'] = true;
+                praefect['failover_election_strategy'] = 'per_repository';
                 praefect['virtual_storages'] = {
                   'default' => {
                     '#{@primary_node_name}' => {

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

@@ -23,7 +23,6 @@ module Gitlab
 
                 gitaly.omnibus_configuration << gitaly_omnibus
                 gitaly.gitaly_tls
-                gitaly.exec_commands = ['gitlab-ctl status']
 
                 gitaly.instance do
                   Component::Gitlab.perform do |gitlab|
@@ -33,7 +32,6 @@ module Gitlab
 
                     gitlab.omnibus_configuration << gitlab_omnibus
                     gitlab.tls = true
-                    gitlab.exec_commands = ['gitlab-ctl status']
 
                     gitlab.instance do
                       puts "Running mTLS specs!"

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.1.1'.freeze
+    VERSION = '7.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.4.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -277,6 +277,7 @@ files:
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/runtime/omnibus_configuration.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/default.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
 - lib/gitlab/qa/runtime/scenario.rb
@@ -298,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