gitlab-qa 7.10.0 → 7.13.1

data/docs/what_tests_can_be_run.md

@@ -1,5 +1,7 @@
 # What tests can be run?
+
 [[_TOC_]]
+
 ## The two types of QA tests
 
 First of all, the first thing to choose is whether you want to run orchestrated
@@ -245,8 +247,8 @@ instance-level tests against it.
 To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the `Test::Instance`
 scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/instance.rb`][test-instance] in the
-GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
+GitLab project).
 
 Example:
 
@@ -370,8 +372,8 @@ that LDAP-related features work as expected.
 To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Integration::LDAPNoTLS` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/ldap_no_tls.rb`][test-integration-ldap-no-tls]
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/integration/ldap_no_tls.rb`][test-integration-ldap-no-tls]
+in the GitLab project).
 
 In EE, both the GitLab standard and LDAP credentials are needed:
 
@@ -393,7 +395,7 @@ $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
 $ gitlab-qa Test::Integration::LDAPNoTLS EE
 ```
 
-[test-integration-ldap-no-tls]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/ldap_no_tls.rb
+[test-integration-ldap-no-tls]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/ldap_no_tls.rb
 
 ### `Test::Integration::LDAPTLS CE|EE|<full image address>`
 
@@ -411,8 +413,8 @@ that LDAP-related features work as expected.
 To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Integration::LDAPTLS` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/ldap_tls.rb`][test-integration-ldap-tls]
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/integration/ldap_tls.rb`][test-integration-ldap-tls]
+in the GitLab project).
 
 In EE, both the GitLab standard and LDAP credentials are needed:
 
@@ -434,8 +436,8 @@ $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
 $ gitlab-qa Test::Integration::LDAPTLS EE
 ```
 
-[test-integration-ldap-tls]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/ldap_tls.rb
-[test-integration-ldap-tls-certs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/tls_certificates/gitlab
+[test-integration-ldap-tls]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/ldap_tls.rb
+[test-integration-ldap-tls-certs]: https://gitlab.com/gitlab-org/gitlab/blob/master/tls_certificates/gitlab
 
 ### `Test::Integration::LDAPNoServer EE|<full image address>`
 
@@ -504,9 +506,9 @@ using SAML.
 
 To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
-`Test::Integration::InstanceSAML` scenario (located under [`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/instance_saml.rb`][test-integration-instance-saml] in the GitLab CE project).
+`Test::Integration::InstanceSAML` scenario (located under [`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/instance_saml.rb`][test-integration-instance-saml] in the GitLab project).
 
-[test-integration-instance-saml]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/instance_saml.rb
+[test-integration-instance-saml]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/instance_saml.rb
 
 **Required environment variables:**
 
@@ -531,8 +533,8 @@ Mattermost server (see `Test::Instance::Image` above).
 To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Integration::Mattermost` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/integration/mattermost.rb`][test-integration-mattermost]
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/integration/mattermost.rb`][test-integration-mattermost]
+in the GitLab project).
 
 **Required environment variables:**
 
@@ -549,7 +551,7 @@ $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
 $ gitlab-qa Test::Integration::Mattermost EE
 ```
 
-[test-integration-mattermost]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/mattermost.rb
+[test-integration-mattermost]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/mattermost.rb
 
 ### `Test::Integration::Packages CE|EE|<full image address>`
 
@@ -668,8 +670,8 @@ against it.
 To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Instance` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/instance.rb`][test-instance] in the
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
+in the GitLab project).
 
 Example:
 
@@ -695,8 +697,8 @@ works as expected by running tests against it.
 To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Instance` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/instance.rb`][test-instance] in the
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
+in the GitLab project).
 
 **Required environment variables:**
 
@@ -723,6 +725,42 @@ $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 $ gitlab-qa Test::Instance::Staging
 ```
 
+### `Test::Instance::StagingRef`
+
+This scenario tests that the [`Staging Ref`](https://staging-ref.gitlab.com)
+works as expected by running tests against it.
+
+To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Instance` scenario (located under
+[`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
+in the GitLab project).
+
+**Required environment variables:**
+
+- `GITLAB_QA_ACCESS_TOKEN`: A valid personal access token with the `api` scope.
+  This is used to retrieve the version that staging is currently running.
+  Staging Ref QA users credentials can be found in the shared GitLab QA 1Password vault.
+
+**Optional environment variables:**
+
+- `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
+  `gitlab-qa-bot` on `dev.gitlab.org` with the `registry` scope.
+  This is used to pull the QA Docker image from the Omnibus GitLab `dev` Container Registry.
+  If the variable isn't present, the QA image from Docker Hub will be used.
+  This can be found in the shared GitLab QA 1Password vault.
+
+Example:
+
+```
+$ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
+$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
+$ export GITLAB_USERNAME="gitlab-qa"
+$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
+
+$ gitlab-qa Test::Instance::StagingRef
+```
+
 ### `Test::Instance::StagingGeo`
 
 This scenario tests that the Geo staging deployment (with [`staging.gitlab.com`](https://staging.gitlab.com) as the primary site and [`geo.staging.gitlab.com`](https://geo.staging.gitlab.com) as the secondary site) works as expected by running tests tagged `:geo` against it. This is done by spinning up a GitLab QA (`gitlab/gitlab-qa`) container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the Geo setup steps in the `QA::EE::Scenario::Test::Geo` scenario are skipped when testing a live Geo deployment.
@@ -789,8 +827,8 @@ Smoke tests are quick tests that ensure that some basic functionality of GitLab
 To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
 container is spun up and tests are run from it by running the
 `Test::Instance::Smoke` scenario (located under
-[`gitlab-org/gitlab-ce@qa/qa/scenario/test/smoke.rb`][smoke-instance] in the
-in the GitLab CE project).
+[`gitlab-org/gitlab/qa/qa/scenario/test/smoke.rb`][smoke-instance] in the
+in the GitLab project).
 
 Example:
 
@@ -863,5 +901,5 @@ $ gitlab-qa Test::Instance::Geo EE https://primary.gitlab.com https://secondary.
 
 [Back to README.md](../README.md)
 
-[test-instance]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/instance/all.rb
-[smoke-instance]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/instance/smoke.rb
+[test-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/all.rb
+[smoke-instance]: https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/instance/smoke.rb

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

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'json'
-require 'uri'
-
 module Gitlab
   module QA
     module Component

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

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'json'
-require 'uri'
-
 module Gitlab
   module QA
     module Component

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

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'json'
-require 'uri'
-
 module Gitlab
   module QA
     module Component

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

@@ -0,0 +1,9 @@
+module Gitlab
+  module QA
+    module Component
+      class StagingRef < Staging
+        ADDRESS = 'https://staging-ref.gitlab.com'.freeze
+      end
+    end
+  end
+end

data/lib/gitlab/qa/report/report_as_issue.rb

@@ -113,7 +113,7 @@ module Gitlab
             "found:#{pipeline}.gitlab.com"
           when 'preprod'
             'found:pre.gitlab.com'
-          when 'staging-orchestrated', 'nightly', QA::Runtime::Env.default_branch
+          when 'staging-orchestrated', 'nightly', QA::Runtime::Env.default_branch, 'staging-ref'
             "found:#{pipeline}"
           else
             raise "No `found:*` label for the `#{pipeline}` pipeline!"

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/instance/staging_ref.rb

@@ -0,0 +1,18 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Instance
+          ##
+          # Run test suite against Staging Ref environment
+          #
+          class StagingRef < DeploymentBase
+            def deployment_component
+              Component::StagingRef
+            end
+          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/support/get_request.rb

@@ -13,10 +13,11 @@ module Gitlab
         end
 
         def execute!
-          response =
+          response = with_retry_on_too_many_requests do
             Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
               http.request(build_request)
             end
+          end
 
           case response
           when Net::HTTPSuccess
@@ -34,6 +35,24 @@ module Gitlab
             req['Cookie'] = ENV['QA_COOKIES'] if ENV['QA_COOKIES']
           end
         end
+
+        def with_retry_on_too_many_requests
+          response = nil
+          retry_count = 0
+
+          while retry_count < 3
+            response = yield
+
+            break unless response.is_a?(Net::HTTPTooManyRequests)
+
+            retry_count += 1
+            wait_seconds = response["retry-after"].to_i
+            puts "Received 429 - Too many requests. Waiting for #{wait_seconds} seconds."
+            sleep wait_seconds
+          end
+
+          response
+        end
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.10.0'.freeze
+    VERSION = '7.13.1'.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
 
@@ -33,6 +34,7 @@ module Gitlab
           autoload :RelativeUrl, 'gitlab/qa/scenario/test/instance/relative_url'
           autoload :RepositoryStorage, 'gitlab/qa/scenario/test/instance/repository_storage'
           autoload :Staging, 'gitlab/qa/scenario/test/instance/staging'
+          autoload :StagingRef, 'gitlab/qa/scenario/test/instance/staging_ref'
           autoload :Production, 'gitlab/qa/scenario/test/instance/production'
           autoload :Smoke, 'gitlab/qa/scenario/test/instance/smoke'
           autoload :Preprod, 'gitlab/qa/scenario/test/instance/preprod'
@@ -69,6 +71,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
@@ -85,6 +88,7 @@ module Gitlab
       autoload :SAML, 'gitlab/qa/component/saml'
       autoload :Specs, 'gitlab/qa/component/specs'
       autoload :Staging, 'gitlab/qa/component/staging'
+      autoload :StagingRef, 'gitlab/qa/component/staging_ref'
       autoload :Production, 'gitlab/qa/component/production'
       autoload :Minio, 'gitlab/qa/component/minio'
       autoload :Preprod, 'gitlab/qa/component/preprod'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.10.0
+  version: 7.13.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -190,6 +190,7 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/ci/rules.gitlab-ci.yml"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rspec"
 - ".rubocop.yml"
@@ -240,6 +241,7 @@ files:
 - lib/gitlab/qa/component/saml.rb
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
+- lib/gitlab/qa/component/staging_ref.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
 - lib/gitlab/qa/docker/shellout.rb
@@ -268,6 +270,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
@@ -286,6 +289,7 @@ files:
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
+- lib/gitlab/qa/scenario/test/instance/staging_ref.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
@@ -303,6 +307,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