gitlab-qa 8.3.2 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9e003021256eefe3a65e372d66dbaa1f93f03f1414c7d5dbf26d0c8426ae1d
-  data.tar.gz: 73bdb9ee88fae3344272a4093ffb44bcc5e856208e69d4b736db13e11cb47464
+  metadata.gz: 0e196fadefd8ed7eb786eccf7b619ce3173077a85a42039c0e93174c3d468a4e
+  data.tar.gz: 99c644f122bf4c4db3b95032c39d572946597c983d00f6b4bb2949034df39055
 SHA512:
-  metadata.gz: 1b64d8409adeced189d03087cc52e89a4b7336f6292c12302e90374d70c1e1b1e7945315a56d079ae6aa7c3dbb6226093b69eea83ee39f4847bb8f07da744c39
-  data.tar.gz: c6865b83358739d867f33c1f3961a52e3f2c7710ccc0854f83107b96719618f3517ea7229543d5c315798852ee23313a67394806bf3eb0bd8c82f7038b8cd727
+  metadata.gz: e9e458196a7efd87fe5b432ee30bc8bc29bc88d18b3037e0be9ad1fb7beaf14537603ae14d2d6482a6154c990687b71ff25043877c410af55a67e61325c5eef4
+  data.tar.gz: 46803ea55f474a5a2b2b4f145200497f3d7646a11574cd1300ae068289c85da94003ef6d57638aec3d34d46474f80c99eafe6b146dbf331f412c203d745bd360

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.3.2)
+    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/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.2'
+    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.2
+  version: 8.4.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control