gitlab-qa 7.9.1 → 7.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c7a87e5b6848fc8a74dba532ff9b5cb11b9f5e4cbb805442c15455581480db
-  data.tar.gz: f52bffc17ce6f6c77438700ac7face46b5c378e47346d1a8fb52d20351002521
+  metadata.gz: 67b2d093e79466c451d4dcd631006b2837be1af4a2ded8e90fc223cdbf90ac5a
+  data.tar.gz: fe671dab02093263ebd86a4d93247a9cc7f1f577e7420e73e0895d7310f9fb7b
 SHA512:
-  metadata.gz: 0bed280e7cb760e5bf3f9402ab79f6eb36677002dc11b6f18d03f76963b6a52d21ee0eef3bf0b9cf488556b35be8bd91bab1bb08669ef612256cdd38ceed55b2
-  data.tar.gz: 10797a35e96fdee11549037153e7670f6b3ed7b919aa158df09695027f72f4e86afa89850b1fd5678292c194835f5d40ddc4a0f443b048389cfa8beb7e710280
+  metadata.gz: 94974ea4b47eba1e9ac585ab1e0673cb28d20bdb8b001d352c1a75032c649d799298833e58fde198e23efd219ad540064637d5cedc7b0af3d82d34d3cc6a7e24
+  data.tar.gz: bcac709cdb6bf3e1edef0a12946c4d790889aa4552c586d8173168db58791b93dd1c2ccacd69aada711f835a68807e83f48aba006654fca3e46fc81351a64018

data/.gitlab-ci.yml

@@ -884,7 +884,7 @@ ee:praefect:
     - .ee-qa
     - .knapsack-variables
     - .rspec-report-opts
-  parallel: 5
+  parallel: 10
   variables:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"

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/component/minio.rb

@@ -9,7 +9,7 @@ module Gitlab
     module Component
       class Minio < Base
         DOCKER_IMAGE = 'minio/minio'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+        DOCKER_IMAGE_TAG = 'RELEASE.2021-09-15T04-54-25Z'.freeze
         # These are secrets used in a local Minio container, they're not used for any online S3 server.
         AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'.freeze
         AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'.freeze
@@ -19,7 +19,7 @@ module Gitlab
         def initialize
           super
 
-          @environment = { MINIO_ACCESS_KEY: AWS_ACCESS_KEY, MINIO_SECRET_KEY: AWS_SECRET_KEY }
+          @environment = { MINIO_ROOT_USER: AWS_ACCESS_KEY, MINIO_ROOT_PASSWORD: AWS_SECRET_KEY }
           @volumes = { host_data_dir => DATA_DIR }
           @buckets = []
         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/scenario/test/integration/client_ssl.rb

@@ -51,7 +51,7 @@ module Gitlab
                 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_client_certificate'] = '/etc/gitlab/trusted-certs/ca.pem';
                 nginx['ssl_verify_depth'] = '2';
               OMNIBUS
             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.1'.freeze
+    VERSION = '7.11.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.9.1
+  version: 7.11.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-10-12 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