gitlab-qa 14.3.0 → 14.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bef7bd332a79ee7f62016c94ad14f6f681b8c957a9f1e862e772704b0dae9e87
-  data.tar.gz: 752ee71edfbbe0f9132da6dd54b201f8772cc396cd90947f9b9c37e5f027fd91
+  metadata.gz: 7b273b35fb530099bd344db6ad9f21b56476f4e5b341677e74f22a52a4fcbcad
+  data.tar.gz: f2712bf79d9fbfa72c89c3fb9d63bce0e4e8b82a164d435be79af21f167d81b6
 SHA512:
-  metadata.gz: b17db04aed34a0419361afbc7a5d3986da58be13bd2cf2c446b8442e3133eb18b56822ec9a0da686e599dc32c20c1d21545029eb75983aae6b1c956a82617c59
-  data.tar.gz: e7e6d86cd7c781c6dd4f1ab70a50e3a601338a2362e8b5ad7d7200aa43845bc0217056753f92e47de765658cdb2d8f8a3f52628ae2c139060cfbfe4c697118c3
+  metadata.gz: ca2c75c3082c7b613e3ca3ef6f439b0873b23842d200643864cbdbb4f4d264002c8630c8f3879c28a47dbe512f7e3560e223218718faad177502104977fdb254
+  data.tar.gz: bb1aa0fd9f7f850d8b441fd56e0c1691d4cac6aaee03793fc6b4b944c945b9cfb6cf8f79b10811da2a2536262d70d9bd954fdbbf01c152f17e9b633d33c03d57

data/Gemfile.lock

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

data/lefthook.yml

@@ -10,3 +10,17 @@
        files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
        glob: '*.{rb,rake}'
        run: REVEAL_RUBOCOP_TODO=0 bundle exec rubocop --parallel --force-exclusion {files}
+
+     # Changelog git trailer for the first commit of the branch
+     changelog-on-first-commit:
+       run: |
+         git fetch origin master
+         first_commit_message=$(git log --format=%B -n 1 $(git log origin/master..HEAD --pretty=format:"%h" | tail -1))
+         if ! echo ${first_commit_message} | grep "Changelog:"; then
+           echo Could not find a Changelog: git trailer on the first commit for this branch.
+           echo
+           echo Please add a trailer by amending the git commit message.
+           echo
+           echo See https://docs.gitlab.com/ee/development/changelog.html#overview for more info.
+           exit 1
+         fi

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

@@ -198,19 +198,25 @@ module Gitlab
             wait_until_ready
             process_exec_commands
           rescue Support::ShellCommand::StatusError => e
+            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.")
               Runtime::Logger.warn(
                 "Retry instance_no_teardown due to Support::ShellCommand::StatusError -- attempt #{retries}"
               )
-              Runtime::Logger.info(
-                "Follow the document " \
-                "https://gitlab.com/gitlab-org/quality/runbooks/-/blob/main/debug_orchestrated_test_locally/running_update-major_and_update-minor_locally.md " \
-                "for debugging this issue locally.")
               teardown!
               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!
             raise e
           end
 

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

@@ -72,13 +72,7 @@ module Gitlab
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';
             git_data_dirs({
-              '#{cluster_config.primary_node_name}' => {
-                'path' => '/var/opt/gitlab/git-data'
-              },
-              '#{cluster_config.secondary_node_name}' => {
-                'path' => '/var/opt/gitlab/git-data'
-              },
-              '#{cluster_config.tertiary_node_name}' => {
+              '#{name}' => {
                 'path' => '/var/opt/gitlab/git-data'
               }
             });

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

@@ -195,17 +195,22 @@ module Gitlab
         # @return [String] the path to the log file
         def log_file
           retries = 0
-          log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-reconfigure-logs.txt"
+          log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-reconfigure.log"
           while File.exist?(log_file)
             break unless File.exist?(log_file)
 
             retries += 1
-            log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-retry-#{retries}-reconfigure-logs.txt"
+            log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-retry-#{retries}-reconfigure.log"
           end
 
           log_file
         end
 
+        def get_reconfigure_log_file_from_artefact
+          all_reconfigure_log_file = Dir["#{Runtime::Env.host_artifacts_dir}/*reconfigure.log"].sort_by { |f| File.mtime(f) }
+          all_reconfigure_log_file.last
+        end
+
         private :log_file
 
         def reconfigure
@@ -213,7 +218,7 @@ module Gitlab
           log_file_path = log_file
           config_file = File.open(log_file_path, "w")
           @docker.attach(name) do |line, _wait|
-            config_file.write(line, mode: 'a')
+            config_file.write(line)
 
             if line.include?('There was an error running gitlab-ctl reconfigure')
               Runtime::Logger.error(

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

@@ -109,8 +109,10 @@ module Gitlab
                 specs.hostname = "qa-e2e-specs.#{gitlab.network}"
                 specs.network = gitlab.network
                 specs.args = [gitlab.address, *rspec_args]
-                # do not generate reports for non release runs
-                specs.env = { 'QA_GENERATE_ALLURE_REPORT' => false } unless release == current_release
+                next if release == current_release
+
+                # do not generate reports and metrics artifacts for non release runs
+                specs.env = { 'QA_GENERATE_ALLURE_REPORT' => false, 'QA_SAVE_TEST_METRICS' => false }
               end
             rescue Support::ShellCommand::StatusError => e
               if release == current_release # only fail on current release

data/lib/gitlab/qa/support/gitlab_version_info.rb

@@ -38,11 +38,15 @@ module Gitlab
         #
         # @example
         # latest_patch(Gem::Version.new("14.10")) => "14.10.5"
+        # latest_patch(Gem::Version.new("14.10.5")) => "14.10.5"
         #
         # @param [Gem::Version] version
         # @return [String]
         def latest_patch(version)
-          versions.find { |ver| ver.to_s.match?(/^#{version}/) }
+          # check if version is already a patch version
+          return version if version.to_s.split('.').size == 3
+
+          versions.find { |ver| ver.to_s.match?(/^#{version}\./) }
         end
 
         private

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.3.0'
+    VERSION = '14.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.3.0
+  version: 14.5.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control