gitlab-qa 14.8.1 → 14.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6315dcd0fabc755ecfb2b64cb7ffc5e73cd77fbba288c8f89be93142ac7174e1
-  data.tar.gz: 557ef329ee26120c50c35f8314853e8d0cb371b52ceeccde7e26e8997b170dd8
+  metadata.gz: 07bcf4d830b0b1a566f938d304e7fca8060314fe8ec2880a0203a758fc50c366
+  data.tar.gz: 9c20f4c1f1c9b234f8fcc4db0f5a38527f2ca6848585bd0f218195841f7cb090
 SHA512:
-  metadata.gz: dbbf2dc9b2c8e5a42a98186e360d1da4166dbe1a24de833a2039e171f1ce06eaaf180c757ed8792d2cfbe9ec39e13602821691e761b186af0213e97239742487
-  data.tar.gz: 44d34468cb7f791ba78648ee726c781de63d1e2096f4f9f444761be0c7d8c006ef0712e6a1aa6b1735d476bdaa0bb46156ad339e81659fcf343e947b9aacf63e
+  metadata.gz: 00051bcdf47a11a19a2b106332acca427acf2c824b098bae1d5227927d88b50f5453e520033d3448e8ba2a914fdd04f34af931f19cc31e136c6d4a8bbcf334f8
+  data.tar.gz: deaf4242a1a8f543d2414c750e4f610b2e9c6e624b6bfea7a421b0946afab810a8b27bdd518e43fdf9be52f5946e1932d25544e942efc19ae7c64cc827b74074

data/Gemfile.lock

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

data/docs/what_tests_can_be_run.md

@@ -74,7 +74,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_CAN_TEST_GIT_PROTOCOL_V2` | `true` | Set to `false` to skip tests that require Git protocol v2 if your environment doesn't support it. | No|
 | `QA_CAN_TEST_ADMIN_FEATURES` | `true` | Set to `false` to skip tests that require admin access. | No|
 | `QA_CAN_TEST_PRAEFECT` | `true` | Set to `false` to skip tests that require Praefect to be running. | No|
-| `QA_DISABLE_RSPEC_RETRY` |-  | Set to `true` to turn off retrying tests on failure. | No|
+| `QA_RETRY_FAILED_SPECS` |-  | Set to `true` to retry failed specs after initial run finishes. | No|
 | `QA_SIMULATE_SLOW_CONNECTION` |-  | Set to `true` to configure Chrome's network settings to simulate a slow connection. | No|
 | `QA_SLOW_CONNECTION_LATENCY_MS` | `2000` | The additional latency (in ms) of the simulated slow connection. | No|
 | `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` | `32` | The maximum throughput (in kbps) of the simulated slow connection. | No|

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

@@ -68,10 +68,11 @@ module Gitlab
         rescue Support::ShellCommand::StatusError => e
           raise e unless retry_failed_specs
 
+          Runtime::Logger.warn("Initial test run failed, attempting to retry failed specs in new process!")
           results_file = File.join(host_artifacts_dir(name), LAST_RUN_FILE)
-          raise "Failed to find initial run results file #{results_file}" unless File.exist?(results_file)
+          raise e unless valid_last_run_file?(results_file)
 
-          Runtime::Logger.warn("Initial test run failed, retrying failed specs in new process!")
+          Runtime::Logger.debug("Found initial run results file '#{results_file}', retrying failed specs!")
           run_specs(name, retry_process: true, initial_run_results_host_path: results_file)
         end
 
@@ -116,8 +117,6 @@ module Gitlab
                      end
 
           env_vars["RSPEC_LAST_RUN_RESULTS_FILE"] = last_run_results_file
-          # TODO: remove once rspec-retry gem is removed
-          env_vars["QA_DISABLE_RSPEC_RETRY"] = "true" if retry_failed_specs
 
           run_volumes = volumes.to_h.merge({ host_artifacts_dir(container_name) => tmp_dir })
           run_volumes[initial_run_results_host_path] = last_run_results_file if retry_process
@@ -221,6 +220,27 @@ module Gitlab
         def last_run_results_file
           File.join(tmp_dir, LAST_RUN_FILE)
         end
+
+        # Validate rspec last run file
+        #
+        # @param [String] results_file
+        # @return [Boolean]
+        def valid_last_run_file?(results_file)
+          unless File.exist?(results_file)
+            Runtime::Logger.error("Failed to find initial run results file '#{results_file}', aborting retry!")
+            return false
+          end
+
+          unless File.read(results_file).include?("failed")
+            Runtime::Logger.error(
+              "Initial run results file '#{results_file}' does not contain any failed tests, aborting retry!"
+            )
+
+            return false
+          end
+
+          true
+        end
       end
     end
   end

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

@@ -39,7 +39,6 @@ module Gitlab
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
-          'QA_DISABLE_RSPEC_RETRY' => :qa_disable_rspec_retry,
           'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
           'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
           'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.8.1'
+    VERSION = '14.9.0'
   end
 end

data/rubocop/cop/gitlab/dangerous_interpolation.rb

@@ -42,7 +42,6 @@ module RuboCop
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
-          'QA_DISABLE_RSPEC_RETRY' => :qa_disable_rspec_retry,
           'QA_SIMULATE_SLOW_CONNECTION' => :qa_simulate_slow_connection,
           'QA_SLOW_CONNECTION_LATENCY_MS' => :qa_slow_connection_latency_ms,
           'QA_SLOW_CONNECTION_THROUGHPUT_KBPS' => :qa_slow_connection_throughput_kbps,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.8.1
+  version: 14.9.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -536,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Integration tests for GitLab