gitlab-qa 8.3.1 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de73ba2a256efc0b8a025d1b46c0299fe8f9906b2a1cb06672a11a04702be170
-  data.tar.gz: e11f0ebabe74afe58b2c5b3621c1114d106aa3c8f828a64a506673b91604b77a
+  metadata.gz: a758eb621a80dc1dffc3abca040003057fdb20fc75c246c1ffdac09808c0a379
+  data.tar.gz: 0b753ad126a428621c735d2277cf2d21132de0969078255afce15affe4e8d7e6
 SHA512:
-  metadata.gz: aa235104c7be55f5b0276133e4a04231939b5dcceaed4e1e454a84ac17539b15c15a9ac09182c9a1ecf3e199105f5b3556fd26d2120370a43e5cfc1777550617
-  data.tar.gz: ccab7c480393683821ffff87aeee541474dcb126ab7a6d77dd24d890eec90a2c2924a178cb2d6dbec46898fdc9ad5f21a328190eb27389e4d6969140e00f481c
+  metadata.gz: db2058be2ccfb34ac72bb7a14cb453142a06d7a88c9084fe575d62425faac0ebda7beace5d45568a7945a3d3cad19939e0a8e60fa0b621b20c39424e01ef2dc9
+  data.tar.gz: 84fcf64c8afe5075d761f0f8116a8fbfb8944c3f801c145c003e13485110815bcbacda5c3ddf01d92e3353f280bdb2cf6cce4862519557912d0894d434f1cd77

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.1)
+    gitlab-qa (8.4.1)
       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/release.rb

@@ -9,19 +9,19 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      /xi
+      /xi.freeze
       CUSTOM_GITLAB_IMAGE_REGEX = %r{
         \A
           (?<image_without_tag>
-            (?<registry>[^\/:]+(:(?<port>\d+))?)
-            .+
+            (?<registry>[^/:]+(:(?<port>\d+))?)
+            (?<project>.+)
             gitlab-
             (?<edition>ce|ee)
           )
           (-qa)?
           (:(?<tag>.+))?
         \z
-      }xi
+      }xi.freeze
 
       # Official dev tag example:
       #  12.5.4(-rc42)-ee
@@ -35,7 +35,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee)
         \z
-      /xi
+      /xi.freeze
 
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
@@ -47,9 +47,9 @@ module Gitlab
       # version
       DEV_TAG_REGEX = /
         \A
-          (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)\-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
+          (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
         \z
-      /xi
+      /xi.freeze
 
       DEFAULT_TAG = 'latest'
       DEFAULT_CANONICAL_TAG = 'nightly'
@@ -63,8 +63,9 @@ module Gitlab
 
       def initialize(release)
         @release = release.to_s.downcase
+        return if valid?
 
-        raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format." unless valid?
+        raise InvalidImageNameError, "The release image name '#{@release}' does not have the expected format."
       end
 
       def to_s
@@ -106,7 +107,14 @@ module Gitlab
       end
 
       def qa_image
-        "#{image}-qa"
+        @qa_image ||= if omnibus_mirror?
+                        omnibus_project = image.match(CUSTOM_GITLAB_IMAGE_REGEX)[:project]
+                        gitlab_project = "/gitlab-org/gitlab/"
+
+                        "#{image.gsub(omnibus_project, gitlab_project)}-qa"
+                      else
+                        "#{image}-qa"
+                      end
       end
 
       def project_name
@@ -133,7 +141,7 @@ module Gitlab
         if dev_gitlab_org? && (match_data = tag.match(DEV_TAG_REGEX))
           "#{match_data[:version]}-#{match_data[:gitlab_ref]}"
         else
-          tag.sub(/[-\.]([ce]e)(\.(\d+))?\z/, '-\1')
+          tag.sub(/[-.]([ce]e)(\.(\d+))?\z/, '-\1')
         end
       end
 
@@ -158,6 +166,7 @@ module Gitlab
 
                                  [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
                                end
+
           {
             username: username,
             password: password,

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/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.3.1'
+    VERSION = '8.4.1'
   end
 end

metadata

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