gitlab-qa 8.3.2 → 8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9e003021256eefe3a65e372d66dbaa1f93f03f1414c7d5dbf26d0c8426ae1d
-  data.tar.gz: 73bdb9ee88fae3344272a4093ffb44bcc5e856208e69d4b736db13e11cb47464
+  metadata.gz: ae27f1af0edb9ce83b3ba33e8f18ddb155b62a786b7977d93ab74dfe2ba33e77
+  data.tar.gz: 45f26af4e1796502625888791990c16403654f1abe9558deca1d7fc351135383
 SHA512:
-  metadata.gz: 1b64d8409adeced189d03087cc52e89a4b7336f6292c12302e90374d70c1e1b1e7945315a56d079ae6aa7c3dbb6226093b69eea83ee39f4847bb8f07da744c39
-  data.tar.gz: c6865b83358739d867f33c1f3961a52e3f2c7710ccc0854f83107b96719618f3517ea7229543d5c315798852ee23313a67394806bf3eb0bd8c82f7038b8cd727
+  metadata.gz: 4b7e606c2e6966d29ddc414e512ad7c2ce19a67dcf9ef20fcdaec5575219aa82631cb77c486e35c74f1a4c956004b6f7519f6422838a09d8e43873a5e9c4bbb4
+  data.tar.gz: 7ebbdd74ef735ecbdcb107bafa1418754f3cc89b18d72da2986b0d0d455145e25e4e4c812ab2d2dcbc72e4d50b2337d5f60d66100d715bbd6d3e4750f9eb9c22

data/.gitlab/ci/jobs/base.gitlab-ci.yml

@@ -143,9 +143,7 @@ variables:
 
 .high-capacity:
   tags:
-    - docker
-    - 7gb
-    - triggered-packages
+    - e2e
 
 .rspec-report-opts:
   variables:

data/.gitlab/ci/jobs/mtls.gitlab-ci.yml

@@ -2,6 +2,7 @@ ce:mtls:
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
+    - .high-capacity
     - .ce-variables
     - .rspec-report-opts
   variables:
@@ -11,6 +12,7 @@ ee:mtls:
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
+    - .high-capacity
     - .ee-variables
     - .rspec-report-opts
   variables:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.3.2)
+    gitlab-qa (8.4.2)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

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

@@ -14,8 +14,14 @@ module Gitlab
 
         def initialize
           @docker = Docker::Engine.new(stream_output: true) # stream test output directly instead of through logger
-          @volumes = {}
           @env = {}
+          @volumes = {}
+          @default_volumes = { '/var/run/docker.sock' => '/var/run/docker.sock' }
+          return if Runtime::Env.qa_knapsack_report_path.blank?
+
+          @default_volumes[Runtime::Env.qa_knapsack_report_path] = File.join(
+            Docker::Volumes::QA_CONTAINER_WORKDIR, 'knapsack'
+          )
         end
 
         def perform
@@ -59,12 +65,12 @@ module Gitlab
                 command.env(key, value)
               end
 
-              command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-              command.volume(File.join(Runtime::Env.host_artifacts_dir, name), File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'))
+              command.volume(
+                File.join(Runtime::Env.host_artifacts_dir, name),
+                File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp')
+              )
 
-              @volumes.to_h.each do |to, from|
-                command.volume(to, from)
-              end
+              volumes.to_h.merge(default_volumes).each { |to, from| command.volume(to, from) }
 
               command.name(name)
             end
@@ -73,6 +79,8 @@ module Gitlab
 
         private
 
+        attr_reader :default_volumes
+
         def docker_pull_qa_image_if_needed
           @docker.login(**release.login_params) if release.login_params
 

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

@@ -159,14 +159,14 @@ module Gitlab
           # Gets the name of the pipeline the test was run in, to be used as the key of a scoped label
           #
           # Tests can be run in several pipelines:
-          #   gitlab-qa, nightly, staging, canary, production, preprod, MRs, and the default branch (master/main)
+          #   gitlab, nightly, staging, canary, production, preprod, MRs, and the default branch (master/main)
           #
           # Some of those run in their own project, so CI_PROJECT_NAME is the name we need. Those are:
           #   nightly, staging, canary, production, and preprod
           #
-          # MR, master/main, and gitlab-qa tests run in gitlab-qa, but we only want to report tests run on
+          # MR, master/main, and gitlab tests run in gitlab-qa, but we only want to report tests run on
           # master/main because the other pipelines will be monitored by the author of the MR that triggered them.
-          # So we assume that we're reporting a master/main pipeline if the project name is 'gitlab-qa'.
+          # So we assume that we're reporting a master/main pipeline if the project name is 'gitlab'.
 
           @pipeline ||= Runtime::Env.pipeline_from_project_name
         end

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

@@ -81,6 +81,7 @@ module Gitlab
           'KNAPSACK_TEST_FILE_PATTERN' => :knapsack_test_file_pattern,
           'KNAPSACK_TEST_DIR' => :knapsack_test_dir,
           'QA_KNAPSACK_REPORT_GCS_CREDENTIALS' => :qa_knapsack_report_gcs_credentials,
+          'QA_KNAPSACK_REPORT_PATH' => :qa_knapsack_report_path,
           'CI' => :ci,
           'CI_COMMIT_REF_NAME' => :ci_commit_ref_name,
           'CI_JOB_NAME' => :ci_job_name,
@@ -198,7 +199,7 @@ module Gitlab
         end
 
         def pipeline_from_project_name
-          ci_project_name.to_s.start_with?('gitlab-qa') ? QA::Runtime::Env.default_branch : ci_project_name
+          ci_project_name.to_s.start_with?('gitlab') ? QA::Runtime::Env.default_branch : ci_project_name
         end
 
         def run_id

data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb

@@ -29,7 +29,6 @@ module Gitlab
                 specs.suite = @suite
                 specs.release = release
                 specs.args = non_rspec_args.push(*args)
-                specs.volumes[host_knapsack_report_path] = "/home/gitlab/qa/knapsack" if host_knapsack_report_path
               end
             end
 
@@ -40,10 +39,6 @@ module Gitlab
             def deployment_component
               raise NotImplementedError, 'Please define the Component for the deployment environment associated with this scenario.'
             end
-
-            def host_knapsack_report_path
-              ENV["QA_KNAPSACK_REPORT_PATH"]
-            end
           end
         end
       end

data/lib/gitlab/qa/support/gitlab_version_info.rb

@@ -155,12 +155,13 @@ module Gitlab
         # All available docker tags
         #
         # @return [Array<String>]
+        # rubocop:disable Metrics/AbcSize
         def tags
           return @tags if defined?(@tags)
 
           logger.info("Fetching docker tags from 'gitlab/gitlab-#{edition}' registry")
           response = HttpRequest.make_http_request(
-            url: "https://registry.hub.docker.com/v1/repositories/gitlab/gitlab-#{edition}/tags",
+            url: "https://registry.hub.docker.com/v2/namespaces/gitlab/repositories/gitlab-#{edition}/tags?page_size=1000",
             fail_on_error: false
           )
 
@@ -171,9 +172,11 @@ module Gitlab
 
           @tags = JSON
             .parse(response.body, symbolize_names: true)
+            .fetch(:results)
             .map { |tag| tag[:name] }
             .select { |tag| tag.match?(VERSION_PATTERN) }
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.3.2'
+    VERSION = '8.4.2'
   end
 end

data/lib/gitlab/qa.rb

@@ -7,6 +7,7 @@ module Gitlab
   module QA
     loader = Zeitwerk::Loader.new
     loader.push_dir("#{__dir__}/qa", namespace: Gitlab::QA)
+    loader.ignore("#{__dir__}/qa/version.rb")
 
     loader.inflector.inflect(
       'dev_ee_qa_image' => 'DevEEQAImage',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.3.2
+  version: 8.4.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control