gitlab-qa 14.8.1 → 14.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6315dcd0fabc755ecfb2b64cb7ffc5e73cd77fbba288c8f89be93142ac7174e1
-  data.tar.gz: 557ef329ee26120c50c35f8314853e8d0cb371b52ceeccde7e26e8997b170dd8
+  metadata.gz: a6f7bd80ea293183e6498166dfff6ed48a13ae11c6075fbb4a6b8da659486f0c
+  data.tar.gz: 1fb02c24469c15088ebaa23607df22dac8237c98afdf3e641bb21c9544d2a6f8
 SHA512:
-  metadata.gz: dbbf2dc9b2c8e5a42a98186e360d1da4166dbe1a24de833a2039e171f1ce06eaaf180c757ed8792d2cfbe9ec39e13602821691e761b186af0213e97239742487
-  data.tar.gz: 44d34468cb7f791ba78648ee726c781de63d1e2096f4f9f444761be0c7d8c006ef0712e6a1aa6b1735d476bdaa0bb46156ad339e81659fcf343e947b9aacf63e
+  metadata.gz: f3f8343857638e8ed1c2b1b496bf9f09094fddd9d14f477d7277bd71c37d967e7ecce22eb369e6a105df956a48b7ce92831812aa82356f82578bfaa6b847f1ca
+  data.tar.gz: 5ca6e86b327ad376cbae3d58184c8f0ce348f8c6830078b4fd202a16c4ec523ced8ee5e68adf89aa2c79e6a71d40f57955f43271c5fef967661b45078b214e7b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.8.1)
+    gitlab-qa (14.10.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)
@@ -175,19 +175,19 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.43.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -280,7 +280,7 @@ DEPENDENCIES
   pry (~> 0.11)
   pry-byebug (~> 3.10.1)
   rake (~> 13.0)
-  rspec (~> 3.7)
+  rspec (~> 3.13)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 2.1)
   solargraph (~> 0.41)

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/gitlab-qa.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'pry-byebug', '~> 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec', '~> 3.13'
   spec.add_development_dependency 'simplecov', '~> 0.22'
   spec.add_development_dependency 'simplecov-cobertura', '~> 2.1'
   spec.add_development_dependency 'solargraph', '~> 0.41'

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

@@ -189,7 +189,7 @@ module Gitlab
           raise 'Invalid instance name!' unless name
         end
 
-        def instance_no_teardown
+        def instance_no_teardown # rubocop:disable Metrics/AbcSize
           begin
             retries ||= 0
             prepare
@@ -201,12 +201,17 @@ module Gitlab
             reconfigure_log_file = get_reconfigure_log_file_from_artefact
             # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
             if (retries += 1) < 3
-              Runtime::Logger.info(
-                "Follow the document " \
-                "https://gitlab.com/gitlab-org/quality/runbooks/-/blob/main/debug_orchestrated_test_locally/ " \
-                "for debugging the test failure locally.")
-              Runtime::Logger.error("Tailing the reconfigure log file: #{reconfigure_log_file}. Please check #{reconfigure_log_file} " \
-                                    "file in the artifacts for more details.")
+              unless reconfigure_log_file.nil?
+                Runtime::Logger.info(
+                  "Follow the document " \
+                  "https://gitlab.com/gitlab-org/quality/runbooks/-/blob/main/debug_orchestrated_test_locally/ " \
+                  "for debugging the test failure locally.")
+
+                # Tailing the reconfigure logs after retries are over and before raising exception
+                Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
+                Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+              end
+
               Runtime::Logger.warn(
                 "Retry instance_no_teardown due to Support::ShellCommand::StatusError -- attempt #{retries}"
               )
@@ -214,9 +219,14 @@ module Gitlab
               retry
             end
 
-            # Tailing the reconfigure logs after retries are over and before raising exception
-            Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
-            Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+            # Printing logs to stdout for last retry failure
+
+            if !reconfigure_log_file.nil? && retries == 3
+              # Tailing the reconfigure logs after retries are over and before raising exception
+              Runtime::Logger.info("Tail of the reconfigure log file, see artifacts for full log: #{reconfigure_log_file}")
+              Support::ShellCommand.new("tail -n 100 #{reconfigure_log_file}", stream_output: true).execute!
+            end
+
             raise e
           end
 

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

@@ -67,7 +67,8 @@ module Gitlab
             gitaly['configuration'] = {
               'listen_addr': '0.0.0.0:#{gitaly_port}',
               'prometheus_listen_addr': '0.0.0.0:9236',
-              'auth_token': 'PRAEFECT_INTERNAL_TOKEN'
+              'auth_token': 'PRAEFECT_INTERNAL_TOKEN',
+              'transactions': {'enabled': #{Runtime::Env.qa_gitaly_transactions_enabled?}}
             }
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';

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,
@@ -371,7 +370,8 @@ module Gitlab
         end
 
         def video_recorder_image
-          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') || 'registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-manual-video-recorder'
+          env_var_value_if_defined('QA_VIDEO_RECORDER_IMAGE') ||
+            'registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-manual-video-recorder'
         end
 
         def video_recorder_version
@@ -471,6 +471,10 @@ module Gitlab
           enabled?(env_var_value_if_defined('QA_RETRY_FAILED_SPECS'), default: false)
         end
 
+        def self.qa_gitaly_transactions_enabled?
+          enabled?(env_var_value_if_defined('QA_GITALY_TRANSACTIONS_ENABLED'), default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -37,7 +37,7 @@ module Gitlab
                 gitlab.skip_availability_check = true
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
                 rspec_args << "--" unless rspec_args.include?('--')
-                rspec_args << %w[--tag ~orchestrated]
+                rspec_args << "--tag ~orchestrated"
                 gitlab.instance do
                   Component::Specs.perform do |specs|
                     specs.suite = 'Test::Instance::Airgapped'

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb

@@ -22,7 +22,7 @@ module Gitlab
                   cluster.join
 
                   rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag repository_storage]
+                  rspec_args << "--tag repository_storage]"
 
                   Component::Specs.perform do |specs|
                     specs.suite = 'Test::Instance::All'

data/lib/gitlab/qa/scenario/test/integration/integrations.rb

@@ -14,7 +14,7 @@ module Gitlab
                 gitlab.instance do
                   Component::Specs.perform do |specs|
                     rspec_args << '--' unless rspec_args.include?('--')
-                    rspec_args << %w[--tag integrations]
+                    rspec_args << "--tag integrations"
                     specs.suite = 'Test::Instance::All'
                     specs.hostname = "qa-e2e-specs.#{gitlab.network}"
                     specs.release = gitlab.release

data/lib/gitlab/qa/scenario/test/integration/jira.rb

@@ -21,7 +21,7 @@ module Gitlab
                       Runtime::Logger.info('Running Jira specs!')
 
                       rspec_args << "--" unless rspec_args.include?('--')
-                      rspec_args << %w[--tag jira]
+                      rspec_args << "--tag jira"
 
                       Component::Specs.perform do |specs|
                         specs.suite = 'Test::Instance::All'

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.8.1'
+    VERSION = '14.10.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.10.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -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