gitlab-qa 14.7.0 → 14.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca8f96e30555fcac3d968c580f1393b87d2114a3616e8ab6dbb98f913f852d4
-  data.tar.gz: 566a628d9587a7eeb6e6bcb530bed7170aa689aaadc50cecb28eaba17096e26e
+  metadata.gz: 3632783614831ceda0acb1c2fa312dcea081c8e878dfe2ce41bdb6f9ac70253b
+  data.tar.gz: 5af7c287d9820b050feb5944a9bf93561ef33442f0120bb71e6c7d0c33528ed3
 SHA512:
-  metadata.gz: 4304f800c1430834f7b335ddae6627e51e6126d883359feefb2863662abe274c8b3de2fadca9328c6f6e9815aeb5df2798a1e839a24cf372ee66cdd5db9bea84
-  data.tar.gz: 1a8325bf53f232d5db6292a63107b15f0acf19a04acb7dc0186474656dbd12744ab429030eb53a4e3f83acc5f9655a7159fc14d89cf81b373650b4045904e95c
+  metadata.gz: 46a5d0fd06137c2f41f8f504f1b3afea1e82ba010f86f704a5991f859c555a45e74e1ad6eaa320e916ed6c8fa9227ef20e47e7da03441f8bc3ec6e6ef2aa2352
+  data.tar.gz: 8ccadd90b943ca72ccd967fabfd70ae26a834ff8b949456eecdda333af3a7e6754b46a956e0dc029b7b70847c9134fb11dcd54a202299d64cbfe2902620c7ca1

data/.gitlab-ci.yml

@@ -10,7 +10,7 @@
 include:
   - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
     inputs:
-      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.4"
+      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}"
   - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 
 stages:
@@ -20,7 +20,7 @@ stages:
   - deploy
 
 default:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3
+  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -41,8 +41,10 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
 variables:
-  DEBIAN_VERSION: bullseye
-  RUBY_VERSION: "3.0"
+  DEBIAN_VERSION: bookworm
+  DOCKER_VERSION: "24.0.5"
+  BUNDLER_VERSION: "2.5"
+  RUBY_VERSION: "3.1"
   BUNDLE_PATH: vendor
   BUNDLE_SILENCE_ROOT_WARNING: "true"
   BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
@@ -142,6 +144,8 @@ package-and-test:
     variables:
       - RUBY_VERSION
       - DEBIAN_VERSION
+      - DOCKER_VERSION
+      - BUNDLER_VERSION
   trigger:
     strategy: depend
     forward:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.7.0)
+    gitlab-qa (14.8.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)

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

@@ -3,6 +3,7 @@
 # rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
+require 'active_support/core_ext/array/grouping'
 
 module Gitlab
   module QA
@@ -23,7 +24,8 @@ module Gitlab
           :runner_network,
           :hostname,
           :additional_hosts,
-          :retry_failed_specs
+          :retry_failed_specs,
+          :infer_qa_image_from_release
 
         def initialize
           @docker = Docker::Engine.new(stream_output: true) # stream test output directly instead of through logger
@@ -155,18 +157,14 @@ module Gitlab
         def args_with_flags(feature_flag_set, retry_process: false)
           return args if feature_flag_set.empty? && !retry_process
 
-          run_args = args.dup
-
-          if retry_process
-            if run_args.include?("--")
-              run_args.push("--only-failures")
-              first_rspec_arg_index = run_args.index("--") + 1
-              # if first arg after `--` is a not a flag, it's a specific spec/folder which needs to be removed
-              run_args.delete_at(first_rspec_arg_index) unless run_args[first_rspec_arg_index].start_with?("--")
-            else
-              run_args.push("--", "--only-failures")
-            end
-          end
+          run_args = if !retry_process
+                       args.dup
+                     elsif args.include?("--")
+                       qa_args, rspec_args = args.split("--")
+                       [*qa_args, "--"] + args_without_spec_arguments(rspec_args).push("--only-failures")
+                     else
+                       args.dup.push("--", "--only-failures")
+                     end
 
           return run_args if feature_flag_set.empty?
 
@@ -174,16 +172,29 @@ module Gitlab
           run_args.insert(1, *feature_flag_set)
         end
 
+        # Remove particular spec argument like specific spec/folder or specific tags
+        #
+        # @param [Array] rspec_args
+        # @return [Array]
+        def args_without_spec_arguments(rspec_args)
+          arg_pairs = rspec_args.each_with_object([]) do |arg, new_args|
+            next new_args.push([arg]) if new_args.last.nil? || arg.start_with?("--") || new_args.last.size == 2
+
+            new_args.last.push(arg)
+          end
+
+          arg_pairs.reject { |pair| pair.first == "--tag" || !pair.first.start_with?("--") }.flatten
+        end
+
         def skip_tests?
           Runtime::Scenario.attributes.include?(:run_tests) && !Runtime::Scenario.run_tests
         end
 
         def qa_image
-          if Runtime::Scenario.attributes.include?(:qa_image)
-            Runtime::Scenario.qa_image
-          else
-            "#{release.qa_image}:#{release.qa_tag}"
-          end
+          infered_qa_image = "#{release.qa_image}:#{release.qa_tag}"
+          return infered_qa_image if infer_qa_image_from_release || !Runtime::Scenario.attributes.include?(:qa_image)
+
+          Runtime::Scenario.qa_image
         end
 
         # Adds volumes to the volumes hash if the relevant host paths exist

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

@@ -106,6 +106,7 @@ module Gitlab
           'CI_NODE_TOTAL' => :ci_node_total,
           'CI_PROJECT_NAME' => :ci_project_name,
           'CI_PROJECT_PATH' => :ci_project_path,
+          'CI_PROJECT_PATH_SLUG' => :ci_project_path_slug,
           'CI_PIPELINE_SOURCE' => :ci_pipeline_source,
           'CI_PIPELINE_ID' => :ci_pipeline_id,
           'CI_PIPELINE_URL' => :ci_pipeline_url,

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -114,6 +114,8 @@ module Gitlab
                 # do not generate reports and metrics artifacts for non release runs or retry failures
                 specs.env = { 'QA_GENERATE_ALLURE_REPORT' => false, 'QA_SAVE_TEST_METRICS' => false }
                 specs.retry_failed_specs = false
+                # if qa-image was set explicitly, make sure it is not used on initial run for release
+                specs.infer_qa_image_from_release = true
               end
             rescue Support::ShellCommand::StatusError => e
               if release == current_release # only fail on current release

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.7.0'
+    VERSION = '14.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.7.0
+  version: 14.8.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control