gitlab-qa 8.3.0 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f11ebd2677dc7ba62bd4b55efc03ad8d9560c38a3e601897a9a201d3c09c8eae
-  data.tar.gz: f8db94175a79e62ae625e8b975fc49b03c4077ff608f40a85fa7ea7a5b3f859d
+  metadata.gz: 0e196fadefd8ed7eb786eccf7b619ce3173077a85a42039c0e93174c3d468a4e
+  data.tar.gz: 99c644f122bf4c4db3b95032c39d572946597c983d00f6b4bb2949034df39055
 SHA512:
-  metadata.gz: 21199373f3dff6e7e9204062fec4e204309e33d3bd50994285691aa8b833e926262ac9359810ba5f0cc1a624168693a7e4f195e3abc819088b5bc2f6736f4d07
-  data.tar.gz: a7dc574dceebed5e61b2383030cd114df7cabd00c974d5e548bed6364a031d6617f8495716fc8b7eb6043b6ad33eb8db33adc0f7cc7b0125871dca8a704c6f26
+  metadata.gz: e9e458196a7efd87fe5b432ee30bc8bc29bc88d18b3037e0be9ad1fb7beaf14537603ae14d2d6482a6154c990687b71ff25043877c410af55a67e61325c5eef4
+  data.tar.gz: 46803ea55f474a5a2b2b4f145200497f3d7646a11574cd1300ae068289c85da94003ef6d57638aec3d34d46474f80c99eafe6b146dbf331f412c203d745bd360

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.3.0)
+    gitlab-qa (8.4.0)
       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/docker/engine.rb

@@ -119,19 +119,11 @@ module Gitlab
         end
 
         def container_exists?(name)
-          Docker::Command.execute("container inspect #{name}")
-        rescue Docker::Shellout::StatusError
-          false
-        else
-          true
+          !Docker::Command.execute("container list --all --format '{{.Names}}' --filter name=^#{name}$").empty?
         end
 
         def network_exists?(name)
-          Docker::Command.execute("network inspect #{name}")
-        rescue Docker::Shellout::StatusError
-          false
-        else
-          true
+          !Docker::Command.execute("network list --format '{{.Name}}' --filter name=^#{name}$").empty?
         end
 
         def network_create(name)

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/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,

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.0'
+    VERSION = '8.4.0'
   end
 end

metadata

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