gitlab-qa 14.4.0 → 14.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85f257a2db8062967a163e8a0b8ba89819f3d3427cf49649f8351d653aebf366
-  data.tar.gz: 1671995024ee6f639d8704f5c51192688f936da372d289df9076ea54ed25327c
+  metadata.gz: d16aa0d0e3acf2f78c85344345d2d7a1637fa9c16154446020d0ffd5649687f9
+  data.tar.gz: 68bbb672fecd7bd17113fd7485cbacf547477cd64362e250296316a897868974
 SHA512:
-  metadata.gz: 2d411d68b8ae74157023616898119cc582c824707bb18b4cf038fdc493123f419491bddf35508e44cedbd8a7149b38d7e0f75f8497a17739a0963973cc579177
-  data.tar.gz: cd2f237877a3f7a85f29509bcbaa5a75a7c8b26b56513d210b78f75f705f864e1dc5d37c505d9e69b5a459af34dd32a8c3cf87dd6fb23b08dd911dbae21614f7
+  metadata.gz: 260445e5a526267392c3d91d81eee2baa37df00c6981acecef40f64d17ebf7a10d608d9eb3eae61a287633ca5e7446fdd4e8da70bc70d1de8a2c915065910248
+  data.tar.gz: fcb5cf3c6a4aa914bb089316cb1f3f1b6d8c666fc7dccf7621c79a90d92dc5dcfb6bb5aa77631059f1c841321baf898471f0e35f09ad7a6d831394badc983a67

data/Gemfile.lock

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

data/README.md

@@ -121,6 +121,7 @@ All the scenarios you can run are described in the
 
 Note: The GitLab QA tool requires that [Docker](https://docs.docker.com/install/) is installed.
 
+
 ### Command-line options
 
 In addition to the [arguments you can use to specify the scenario and
@@ -166,6 +167,25 @@ useful if you want to run and debug a specific test, for example:
 $ bundle exec bin/qa Test::Instance::All http://localhost:32768 -- qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
 ```
 
+### Lefthook
+
+[Lefthook](https://github.com/evilmartians/lefthook) is a Git hooks manager that allows
+custom logic to be executed prior to Git committing or pushing. This project comes with
+Lefthook configuration checked in (`lefthook.yml`), but it must be installed.
+
+#### Install Lefthook
+
+   ```shell
+   # Install the `lefthook` Ruby gem:
+   bundle install
+   # Initialize the lefthook config and adds to .git/hooks dir
+   bundle exec lefthook install
+   # Verify hook execution works as expected
+   bundle exec lefthook run pre-push
+   ```
+
+For a detailed guide on `lefthook` configuration see https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
+
 ### How to add new tests
 
 Please see the [Beginner's guide to writing end-to-end tests](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/beginners_guide.html).

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/ai_gateway.rb

@@ -6,17 +6,27 @@ module Gitlab
       class AiGateway < Base
         DOCKER_IMAGE = 'registry.gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/model-gateway'
         DOCKER_IMAGE_TAG = 'latest'
+        LOG_DIR = '/var/log'
 
         def name
           @name ||= 'ai-gateway'
         end
 
+        def log_volume
+          @log_volume ||= {
+            src: File.join(Runtime::Env.host_artifacts_dir, @name, 'logs'),
+            dest: LOG_DIR
+          }
+        end
+
         def configure_environment(gitlab_hostname:)
           @environment = {
             'AIGW_GITLAB_URL' => "http://#{gitlab_hostname}",
             'AIGW_GITLAB_API_URL' => "http://#{gitlab_hostname}/api/v4",
             'AIGW_CUSTOMER_PORTAL_URL' => Runtime::Env.customer_portal_url,
-            'AIGW_USE_FAKE_MODELS' => true
+            'AIGW_USE_FAKE_MODELS' => true,
+            'AIGW_LOGGING__LEVEL' => 'debug',
+            'AIGW_LOGGING__TO_FILE' => "..#{LOG_DIR}/modelgateway_debug.log"
           }
         end
       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,19 +195,19 @@ 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-logs.txt"].sort_by { |f| File.mtime(f) }
+          all_reconfigure_log_file = Dir["#{Runtime::Env.host_artifacts_dir}/*reconfigure.log"].sort_by { |f| File.mtime(f) }
           all_reconfigure_log_file.last
         end
 

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.4.0'
+    VERSION = '14.6.0'
   end
 end

metadata

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