gitlab-qa 15.8.0 → 15.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f712be690928e97a469fb1845b7032a8064df288ea7110c98aa782a01c84a41
-  data.tar.gz: df0a1fc951cacee6d314fcbdc9e02b1b7e7628d8ae489807a42a1b8713bbb3b4
+  metadata.gz: 62f35e5b964b9eebe81ee065da70d428ad6a92e42146ece90c99cb058992608d
+  data.tar.gz: dadb71a13c7fc0d5c16f939d87e004ef70bba72468624ed089fb7b6592f647ff
 SHA512:
-  metadata.gz: 057716e20ffafc661fdb6489dc7f23cdb57252f097b8b9c6cf55f62dadcf326140d3725010418c3121f403771779b9ebd8b7f4df290030dd6a906b372df05dc7
-  data.tar.gz: 660b043282d0d028ea8790c52ec10f0696c1236a15533e469b7514355bfba98f1870144c08b682b40a720464cc1153b5d0a69ca5f75a4f3651920454aabcda81
+  metadata.gz: e39b28201d0ae2d1f4fce45b6b37960ca2269072ffafdd0d245d35d99f7d69eafc5cd93cf0aed3b253ebf03debd57862709995ca31702ab23e490972879ca334
+  data.tar.gz: bb8ab755a2fb9edb127bf7c17d8949d000acf3e75a5b1c2fabfc6ef5b0895588836ca8ac0e0c790f9ebd7d21a48665b1ea95c13c7d1b18103bbb97ee58864fec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (15.8.0)
+    gitlab-qa (15.9.0)
       activesupport (>= 6.1, < 8)
       ffi (~> 1.17)
       gitlab (~> 4.19)

data/docs/what_tests_can_be_run.md

@@ -304,8 +304,12 @@ Scenario verifies upgrade from previous (major|minor|patch) version to current r
 
 - Deploys previous (major|minor|patch) version and runs Health Check test suite (Smoke test suite if below 17.1.0)
   to populate data in database before upgrade
-- Generates upgrade path following current GitLab recommendations
-  from ['gitlab.com/gitlab-org/gitlab'](https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml) project
+- Generates upgrade path following current GitLab recommendations.
+  The upgrade path is resolved in this order:
+  1. `QA_UPGRADE_PATH_FILE` env var — explicit path to a local YAML file.
+  2. `$CI_PROJECT_DIR/config/upgrade_path.yml` — set automatically in GitLab CI when running inside a `gitlab-org/gitlab` pipeline.
+  3. `../config/upgrade_path.yml` relative to the working directory — covers running from the `qa/` subdirectory of a gitlab checkout.
+  4. Remote fetch from [`gitlab.com/gitlab-org/gitlab`](https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml) (fallback when no local file is found).
 - Gradually upgrades GitLab instances to `<current_version>`
   associated with provided `<full image address>` and runs tests against it
 

data/gitlab-qa.gemspec

@@ -16,6 +16,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://about.gitlab.com/'
   spec.license       = 'MIT'
 
+  spec.metadata = {
+    'source_code_uri' => 'https://gitlab.com/gitlab-org/gitlab-qa',
+    'bug_tracker_uri' => 'https://gitlab.com/gitlab-org/gitlab-qa/-/issues'
+  }
+
   spec.files         = `git ls-files -z`
                        .split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.bindir        = 'exe'

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

@@ -104,7 +104,8 @@ module Gitlab
         #
         # @return [String]
         def working_dir_tmp_fixture_path
-          @local_fixture_path ||= Dir.mktmpdir('ldap', FileUtils.mkdir_p("#{Dir.pwd}/tmp"))
+          FileUtils.mkdir_p("#{Dir.pwd}/tmp")
+          @local_fixture_path ||= Dir.mktmpdir('ldap', "#{Dir.pwd}/tmp")
         end
 
         # Copy fixtures to current working directory

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

@@ -209,20 +209,82 @@ module Gitlab
         UPGRADE_PATH_URL = "https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml"
         UPGRADE_PATH_RETRIES = 3
         UPGRADE_PATH_RETRY_DELAY = 5
+        UPGRADE_PATH_RELATIVE_FILE = "config/upgrade_path.yml"
 
         # Upgrade path yml
         #
         # @return [String]
         def upgrade_path_yml
-          @upgrade_path_yml ||= fetch_upgrade_path_with_retry
+          @upgrade_path_yml ||= read_local_upgrade_path || fetch_upgrade_path_with_retry
         end
 
+        # Attempt to read upgrade_path.yml from a local checkout, trying candidate
+        # paths in order:
+        #   1. The file pointed to by the QA_UPGRADE_PATH_FILE env var (explicit override).
+        #   2. $CI_PROJECT_DIR/config/upgrade_path.yml (set by GitLab CI when gitlab-qa
+        #      runs inside a gitlab checkout pipeline).
+        #   3. ../config/upgrade_path.yml relative to the working directory (gitlab-qa
+        #      typically runs from the qa/ subdirectory of a gitlab checkout).
+        #
+        # Returns the file contents as a String when a readable file is found, or nil
+        # when none of the candidates exist so the caller can fall back to a remote fetch.
+        #
+        # @return [String, nil]
+        def read_local_upgrade_path
+          warn_if_explicit_override_missing
+
+          candidates = local_upgrade_path_candidates.select { |path| File.file?(path) }
+          return if candidates.empty?
+
+          path = candidates.first
+          content = File.read(path)
+
+          if content.strip.empty?
+            logger.warn("Local upgrade path file is empty, falling back to remote fetch: #{path}")
+            return
+          end
+
+          logger.info("Reading gitlab upgrade path from local file: #{path}")
+          content
+        end
+
+        # Ordered list of local file path candidates for upgrade_path.yml.
+        #
+        # @return [Array<String>]
+        def local_upgrade_path_candidates
+          candidates = []
+          candidates << ENV["QA_UPGRADE_PATH_FILE"] if ENV["QA_UPGRADE_PATH_FILE"]
+          candidates << File.join(ENV["CI_PROJECT_DIR"], UPGRADE_PATH_RELATIVE_FILE) if ENV["CI_PROJECT_DIR"]
+          candidates << File.expand_path(File.join("..", UPGRADE_PATH_RELATIVE_FILE))
+          candidates
+        end
+
+        # Log a warning when QA_UPGRADE_PATH_FILE is explicitly set but does not point
+        # to a readable file. A typo'd or stale path would otherwise silently fall
+        # through to the CI_PROJECT_DIR / relative-path candidates (or the remote
+        # fetch), producing a different upgrade path than the user intended.
+        #
+        # @return [void]
+        def warn_if_explicit_override_missing
+          explicit = ENV.fetch("QA_UPGRADE_PATH_FILE", nil)
+          return unless explicit
+          return if File.file?(explicit)
+
+          logger.warn("QA_UPGRADE_PATH_FILE is set to '#{explicit}' but the file does not exist; " \
+                      "falling through to other candidates")
+        end
+
+        # Fetch upgrade_path.yml from the remote GitLab repository, retrying on
+        # transient errors. Raises after UPGRADE_PATH_RETRIES failed attempts.
+        #
+        # @return [String]
         def fetch_upgrade_path_with_retry
           retries = 0
+          headers = upgrade_path_request_headers
 
           logger.info("Fetching gitlab upgrade path from 'gitlab.com/gitlab-org/gitlab' project")
           begin
-            HttpRequest.make_http_request(url: UPGRADE_PATH_URL).body
+            HttpRequest.make_http_request(url: UPGRADE_PATH_URL, headers: headers).body
           rescue StandardError => e
             retries += 1
             if retries <= UPGRADE_PATH_RETRIES
@@ -234,6 +296,20 @@ module Gitlab
             raise "Failed to fetch gitlab upgrade path after #{UPGRADE_PATH_RETRIES} retries: #{e.message}"
           end
         end
+
+        # Build request headers for the upgrade path HTTP fetch.
+        #
+        # Includes a User-Agent header when GITLAB_QA_USER_AGENT is set, so the
+        # request matches the Cloudflare bypass rule already in place for GitLab QA.
+        #
+        # @return [Hash]
+        def upgrade_path_request_headers
+          user_agent = Runtime::Env.gitlab_qa_user_agent.to_s.strip
+          return {} if user_agent.empty?
+
+          logger.info("Using GITLAB_QA_USER_AGENT for upgrade path fetch")
+          { "User-Agent" => user_agent }
+        end
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '15.8.0'
+    VERSION = '15.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 15.8.0
+  version: 15.9.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-10 00:00:00.000000000 Z
+date: 2026-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -536,7 +536,9 @@ files:
 homepage: http://about.gitlab.com/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://gitlab.com/gitlab-org/gitlab-qa
+  bug_tracker_uri: https://gitlab.com/gitlab-org/gitlab-qa/-/issues
 post_install_message:
 rdoc_options: []
 require_paths: