gitlab-qa 7.9.2 → 7.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a2005951e787030d65328cb79b2648d3f924e160c4d9ce29a74620b6605f6f
-  data.tar.gz: 1684b8e6c59f4b4a0c745212492d201439c5ba592284a6661dad2335ae1db242
+  metadata.gz: 6b9dcb4935c0cc27ed0c101098a6ef19a63db8697aec420844b499b614190669
+  data.tar.gz: fff48c4b8887be1b5915885bf6698d1b34c289c794dafab5d12f63ce1ec52262
 SHA512:
-  metadata.gz: e00789509550eb418e7f1d3a274ece9ee372a20c147af0cacd6eb25c0e6b2c9ba46124a3fe63b5957d5fa6b18d3ef115576f0057caa5ce0f26513f73cf34a632
-  data.tar.gz: ef94d1f6ec4e1f7fde22aaf8da43992d9e3f4bec7d508f80f534429196cf5816e7a61678ea849d1d39b3ca74d07b610c131c66f2e096dde098d8fe7c0df137a0
+  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/gitlab-qa.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'climate_control', '~> 0.2'
   spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
   spec.add_development_dependency 'pry', '~> 0.11'
-  spec.add_development_dependency 'rake', '~> 12.2'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'solargraph', '~> 0.41'
   spec.add_development_dependency 'webmock', '3.7.0'
   spec.add_runtime_dependency 'activesupport', '~> 6.1'
   spec.add_runtime_dependency 'gitlab', '~> 4.16.1'
-  spec.add_runtime_dependency 'http', '4.3.0'
+  spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'table_print', '1.5.7'
 end

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

@@ -49,6 +49,9 @@ module Gitlab
           'GITLAB_SANDBOX_NAME' => :gitlab_sandbox_name,
           'GITLAB_QA_ACCESS_TOKEN' => :qa_access_token,
           'GITLAB_QA_ADMIN_ACCESS_TOKEN' => :qa_admin_access_token,
+          'GITLAB_QA_DEV_ACCESS_TOKEN' => :qa_dev_access_token,
+          'GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN' => :qa_container_registry_access_token,
+          'GITLAB_QA_ISSUE_URL' => :qa_issue_url,
           'GITHUB_ACCESS_TOKEN' => :github_access_token,
           'GITLAB_URL' => :gitlab_url,
           'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname,
@@ -60,6 +63,7 @@ module Gitlab
           'CLOUDSDK_CORE_PROJECT' => :cloudsdk_core_project,
           'GCLOUD_REGION' => :gcloud_region,
           'SIGNUP_DISABLED' => :signup_disabled,
+          'GITLAB_CI_API_TOKEN' => :gitlab_ci_api_token,
           'GITLAB_QA_USERNAME_1' => :gitlab_qa_username_1,
           'GITLAB_QA_PASSWORD_1' => :gitlab_qa_password_1,
           'GITLAB_QA_USERNAME_2' => :gitlab_qa_username_2,
@@ -71,17 +75,24 @@ module Gitlab
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'CI' => :ci,
+          'CI_COMMIT_REF_NAME' => :ci_commit_ref_name,
           'CI_JOB_NAME' => :ci_job_name,
           'CI_JOB_URL' => :ci_job_url,
+          'CI_JOB_TOKEN' => :ci_job_token,
           'CI_RUNNER_ID' => :ci_runner_id,
           'CI_SERVER_HOST' => :ci_server_host,
           'CI_SERVER_PERSONAL_ACCESS_TOKEN' => :ci_server_personal_access_token,
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
+          'CI_PROJECT_ID' => :ci_project_id,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
+          'CI_PIPELINE_ID' => :ci_pipeline_id,
+          'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
+          'CI_PIPELINE_URL' => :ci_pipeline_url,
           'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
           'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
+          'CI_API_V4_URL' => :ci_api_v4_url,
           'GITLAB_CI' => :gitlab_ci,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
@@ -108,20 +119,32 @@ module Gitlab
           'GOOGLE_PROJECT' => :google_project,
           'GOOGLE_CLIENT_EMAIL' => :google_client_email,
           'GOOGLE_JSON_KEY' => :google_json_key,
-          'GCS_BUCKET_NAME' => :gcs_bucket_name
+          'GCS_BUCKET_NAME' => :gcs_bucket_name,
+          'SMOKE_ONLY' => :smoke_only,
+          'NO_ADMIN' => :no_admin
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
           attr_writer(method_name)
 
           define_method(method_name) do
-            ENV[env_name] ||
-              if instance_variable_defined?("@#{method_name}")
-                instance_variable_get("@#{method_name}")
-              end
+            ENV[env_name] || (instance_variable_get("@#{method_name}") if instance_variable_defined?("@#{method_name}"))
           end
         end
 
+        def variables
+          vars = {}
+
+          ENV_VARIABLES.each do |name, attribute|
+            # Variables that are overridden in the environment take precedence
+            # over the defaults specified by the QA runtime.
+            value = env_value_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
+            vars[name] = value if value
+          end
+
+          vars
+        end
+
         def default_branch
           ENV['QA_DEFAULT_BRANCH'] || 'main'
         end
@@ -142,42 +165,6 @@ module Gitlab
           ENV['GITLAB_API_BASE'] || 'https://gitlab.com/api/v4'
         end
 
-        def gitlab_ci_api_token
-          ENV['GITLAB_CI_API_TOKEN']
-        end
-
-        def ci_api_v4_url
-          ENV['CI_API_V4_URL']
-        end
-
-        def ci_job_name
-          ENV['CI_JOB_NAME']
-        end
-
-        def ci_job_token
-          ENV['CI_JOB_TOKEN']
-        end
-
-        def ci_pipeline_source
-          ENV['CI_PIPELINE_SOURCE']
-        end
-
-        def ci_pipeline_url
-          ENV['CI_PIPELINE_URL']
-        end
-
-        def ci_pipeline_id
-          ENV['CI_PIPELINE_ID']
-        end
-
-        def ci_project_id
-          ENV['CI_PROJECT_ID']
-        end
-
-        def ci_commit_ref_name
-          ENV['CI_COMMIT_REF_NAME']
-        end
-
         def pipeline_from_project_name
           if ci_project_name.to_s.start_with?('gitlab-qa')
             if ENV['TOP_UPSTREAM_SOURCE_JOB'].to_s.start_with?('https://ops.gitlab.net')
@@ -198,22 +185,10 @@ module Gitlab
           env_value_if_defined('GITLAB_QA_DEV_ACCESS_TOKEN')
         end
 
-        def qa_dev_access_token
-          ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
-        end
-
         def initial_root_password
           ENV['GITLAB_INITIAL_ROOT_PASSWORD'] || '5iveL!fe'
         end
 
-        def qa_container_registry_access_token
-          ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
-        end
-
-        def qa_issue_url
-          ENV['GITLAB_QA_ISSUE_URL']
-        end
-
         def deploy_environment
           ENV['DEPLOY_ENVIRONMENT'] || pipeline_from_project_name
         end
@@ -226,35 +201,6 @@ module Gitlab
           ENV['ELASTIC_VERSION'] || '6.4.2'.freeze
         end
 
-        def aws_s3_region
-          ENV['AWS_S3_REGION']
-        end
-
-        def aws_s3_key_id
-          ENV['AWS_S3_KEY_ID']
-        end
-
-        def aws_s3_access_key
-          ENV['AWS_S3_ACCESS_KEY']
-        end
-
-        def aws_s3_bucket_name
-          ENV['AWS_S3_BUCKET_NAME']
-        end
-
-        def variables
-          vars = {}
-
-          ENV_VARIABLES.each do |name, attribute|
-            # Variables that are overridden in the environment take precedence
-            # over the defaults specified by the QA runtime.
-            value = env_value_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
-            vars[name] = value if value
-          end
-
-          vars
-        end
-
         def require_license!
           return if ENV.include?('EE_LICENSE')
 
@@ -293,31 +239,42 @@ module Gitlab
 
         def require_kubernetes_environment!
           %w[GCLOUD_ACCOUNT_EMAIL GCLOUD_ACCOUNT_KEY CLOUDSDK_CORE_PROJECT].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run kubernetes specs"
+            end
           end
         end
 
         def require_aws_s3_environment!
           %w[AWS_S3_REGION AWS_S3_KEY_ID AWS_S3_ACCESS_KEY AWS_S3_BUCKET_NAME].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 object storage specs"
+            end
           end
         end
 
         def require_gcs_environment!
           %w[GOOGLE_PROJECT GOOGLE_CLIENT_EMAIL GOOGLE_JSON_KEY GCS_BUCKET_NAME].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs"
+            end
           end
         end
 
         def require_initial_password!
           return unless ENV['GITLAB_INITIAL_ROOT_PASSWORD'].to_s.strip.empty?
 
-          raise ArgumentError, "Environment variable GITLAB_INITIAL_ROOT_PASSWORD must be provided to set an initial root password."
+          raise(
+            ArgumentError,
+            "Environment variable GITLAB_INITIAL_ROOT_PASSWORD must be provided to set an initial root password."
+          )
         end
 
         def require_ssh_tunnel!
           %w[TUNNEL_SSH_PRIVATE_KEY TUNNEL_SERVER_HOSTNAME TUNNEL_SSH_USER].each do |env_key|
-            raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs" unless ENV.key?(env_key)
+            unless ENV.key?(env_key)
+              raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs"
+            end
           end
         end
 

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/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.9.2'.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.9.2
+  version: 7.12.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -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