gitlab-qa 15.7.0 → 15.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15ce3f10ca0b06c96ca963f5b18e4935dd1d08633849ff50b13f988786b4fbb
-  data.tar.gz: 3285a7abf021446299d6ea709cc7086a2a16bc255d983d3e636ed960e342c24f
+  metadata.gz: e2f5e12b0e4b1d6949c3bf2ac7b988ab0f4b42a1c9e039828da20d0611f0e284
+  data.tar.gz: c41f28650cf5a9da55dbe1e97b6c9d4d04f08457e8d19f57982ecf193879603a
 SHA512:
-  metadata.gz: ed753464020cb944a4c66ed615987b955328e15661f49bae683361340f4df24bb19fcd662f179f6fdb27262c285ddb94ef4a81fb570fdcffac789654808c4e22
-  data.tar.gz: 0bc7581958bcb90509cd05ec5afd2c5fb1f499af131608f145da7e8490d9b607041b4a8cc4d86ade69f1bfb97d73ef4308032c31b717c09d08b881eab6eeef22
+  metadata.gz: afdb8a6544dd8aa320f1b076d16ce0aa6dc453e014f3bf8b7b30fd1b29a2abd0d1d99df34755ae4812e9bc1c83da7d154a7bfdc7a68894a1d2ef71b8bfacc17a
+  data.tar.gz: 6ddd0641fe2d3cf5e5f63915854bea06b4fac93ec18d2f6651f85dbd581621aa952741d35575f4ee56b91709c383c2c12318825e8250345857ff16c4930f086a

data/Gemfile.lock

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

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

@@ -36,6 +36,10 @@ module Gitlab
           @network_aliases.push(name)
         end
 
+        def add_exec_commands(*commands)
+          @exec_commands.concat(commands.flatten)
+        end
+
         def name
           raise NotImplementedError, "#{self.class.name} must specify a default name"
         end

data/lib/gitlab/qa/release.rb

@@ -154,6 +154,9 @@ module Gitlab
         # Case 2: Auto-deploy packages from dev.gitlab.org (e.g., 12.1.201906121026-325a6632895.b340d0bd35d)
         elsif match_data = tag.match(DEV_TAG_REGEX)
           match_data[:gitlab_ref]
+        # Case 3: Internal release packages (e.g., 18.7.1-internal2-0)
+        elsif tag.match?(/\d+\.\d+\.\d+-internal\d+-0\z/)
+          tag.delete_suffix('-0')
         else
           tag.sub(/[-.]([ce]e)(\.(\d+))?\z/, '-\1')
         end

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

@@ -42,6 +42,7 @@ module Gitlab
                     secondary.release = release
                     secondary.name = 'gitlab-secondary'
                     secondary.network = 'geo'
+                    secondary.seed_admin_token = false
                     secondary.omnibus_configuration << <<~OMNIBUS
                       geo_secondary['db_fdw'] = true;
                       geo_secondary_role['enable'] = true;
@@ -57,7 +58,8 @@ module Gitlab
                       sidekiq['concurrency'] = 2;
                       puma['worker_processes'] = 2;
                     OMNIBUS
-                    secondary.exec_commands += fast_ssh_key_lookup_commands + QA::Scenario::CLICommands.git_lfs_install_commands
+                    secondary.add_exec_commands(fast_ssh_key_lookup_commands)
+                    secondary.add_exec_commands(QA::Scenario::CLICommands.git_lfs_install_commands)
 
                     secondary.act do
                       # TODO, we do not wait for secondary to start because of

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

@@ -206,15 +206,32 @@ module Gitlab
             .map { |version| Gem::Version.new("#{version[:major]}.#{version[:minor]}") }
         end
 
+        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 yml
         #
         # @return [String]
         def upgrade_path_yml
-          @upgrade_path_yml ||= begin
-            logger.info("Fetching gitlab upgrade path from 'gitlab.com/gitlab-org/gitlab' project")
-            HttpRequest.make_http_request(
-              url: "https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml"
-            ).body
+          @upgrade_path_yml ||= fetch_upgrade_path_with_retry
+        end
+
+        def fetch_upgrade_path_with_retry
+          retries = 0
+
+          logger.info("Fetching gitlab upgrade path from 'gitlab.com/gitlab-org/gitlab' project")
+          begin
+            HttpRequest.make_http_request(url: UPGRADE_PATH_URL).body
+          rescue StandardError => e
+            retries += 1
+            if retries <= UPGRADE_PATH_RETRIES
+              logger.warn("Failed to fetch upgrade path (attempt #{retries}/#{UPGRADE_PATH_RETRIES}): #{e.message}")
+              sleep UPGRADE_PATH_RETRY_DELAY
+              retry
+            end
+
+            raise "Failed to fetch gitlab upgrade path after #{UPGRADE_PATH_RETRIES} retries: #{e.message}"
           end
         end
       end

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

@@ -24,6 +24,15 @@ module Gitlab
         # @param [String] semver_component version number component for previous version detection - major|minor|patch
         # @return [Gem::Version]
         def previous_version(semver_component)
+          # Check for environment variable override
+          override_key = "QA_PREVIOUS_#{semver_component.upcase}_OVERRIDE"
+          override_value = ENV.fetch(override_key, nil)
+
+          if override_value && !override_value.empty?
+            logger.info("Using override for previous #{semver_component}: #{override_value}")
+            return Gem::Version.new(override_value)
+          end
+
           case semver_component
           when "major"
             previous_major
@@ -60,7 +69,10 @@ module Gitlab
           # 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}\./) }.tap do |ver|
+          result = versions.find { |ver| ver.to_s.match?(/^#{version}\./) }
+          result ||= handle_latest_patch_prerelease_fallback(version) if current_version.include?('-pre')
+
+          result.tap do |ver|
             raise_version_not_found("Latest patch version for version #{version}") unless ver
           end
         end
@@ -88,6 +100,49 @@ module Gitlab
 
         private
 
+        def handle_latest_patch_prerelease_fallback(version)
+          return unless version.to_s.match?(/^\d+$/)
+
+          log_fallback_info("major", version.to_s)
+
+          fallback_major = version.segments[0] - 1
+          return unless fallback_major.positive?
+
+          result = versions.find { |ver| ver.to_s.match?(/^#{fallback_major}\./) }
+          logger.warn("🔄 Using fallback major version: #{result}") if result
+          result
+        end
+
+        def find_previous_minor_version
+          target_minor = current_minor - 1
+          result = versions.find { |version| version.to_s.match?(/^#{current_major}\.#{target_minor}/) }
+
+          return result if result
+          return unless current_version.include?('-pre')
+
+          find_previous_minor_prerelease_fallback(target_minor)
+        end
+
+        def find_previous_minor_prerelease_fallback(target_minor)
+          log_fallback_info("minor", "#{current_major}.#{target_minor}")
+
+          result = find_fallback_minor_version(target_minor)
+          return result if result
+
+          result = previous_major
+          logger.warn("🔄 Falling back to previous major version: #{result}") if result
+          result
+        end
+
+        def find_fallback_minor_version(target_minor)
+          fallback_minor_version = target_minor - 1
+          return unless fallback_minor_version >= 0
+
+          result = versions.find { |version| version.to_s.match?(/^#{current_major}\.#{fallback_minor_version}/) }
+          logger.warn("🔄 Using fallback minor version: #{result}") if result
+          result
+        end
+
         MAX_TAGS_HTTP_REQUESTS = 50
         # https://docs.docker.com/docker-hub/api/latest/#tag/images/operation/GetNamespacesRepositoriesImages
         TAGS_PER_PAGE = 100
@@ -138,7 +193,8 @@ module Gitlab
           return fallback_minor unless tags
           return previous_major if current_minor.zero?
 
-          versions.find { |version| version.to_s.match?(/^#{current_major}\.#{current_minor - 1}/) }.tap do |ver|
+          result = find_previous_minor_version
+          result.tap do |ver|
             raise_version_not_found("Previous minor version for current version #{current_version}") unless ver
           end
         end
@@ -242,7 +298,105 @@ module Gitlab
         end
 
         def raise_version_not_found(error_prefix)
-          raise(VersionNotFoundError, "#{error_prefix} not available on Dockerhub (yet)")
+          error_message = build_detailed_error_message(error_prefix)
+          raise(VersionNotFoundError, error_message)
+        end
+
+        # Build a detailed, helpful error message for version not found scenarios
+        def build_detailed_error_message(error_prefix)
+          separator = "=" * 80
+
+          message = <<~ERROR
+
+            #{separator}
+            🚨 GITLAB QA VERSION DETECTION ERROR 🚨
+            #{separator}
+
+            #{error_prefix} not available on Dockerhub (yet)
+
+            CONTEXT:
+            • Current version: #{current_version}
+            • Looking for: #{describe_missing_version}
+            • This typically happens during GitLab's monthly release cycle
+
+            WHY THIS HAPPENS:
+            During the 1-day window between VERSION file updates and actual release:
+            1. VERSION file gets updated to next version (e.g., 18.9.0-pre)
+            2. Upgrade tests look for previous version (e.g., 18.8.x)
+            3. But that version hasn't been released to Docker Hub yet
+
+            SOLUTIONS:
+            1. WAIT: This will resolve automatically after the release (usually within 24 hours)
+            2. OVERRIDE: Set environment variable to use a known version:
+               #{suggest_override_variable}
+            3. SKIP: Temporarily disable these upgrade tests during pre-release periods
+            4. VERIFY: Check available versions on Docker Hub:
+               https://hub.docker.com/r/gitlab/gitlab-#{edition}/tags
+
+            MORE INFO:
+            • Documentation: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/
+            • Release schedule: https://about.gitlab.com/releases/
+            • Report issues: https://gitlab.com/gitlab-org/gitlab-qa/-/issues
+
+            #{separator}
+          ERROR
+
+          message.strip
+        end
+
+        # Describe what version we're looking for based on current context
+        def describe_missing_version
+          if current_version.include?('-pre')
+            if current_minor.positive?
+              "#{current_major}.#{current_minor - 1}.x versions (previous minor)"
+            else
+              "#{current_major - 1}.x.x versions (previous major)"
+            end
+          else
+            "Previous version for #{current_version}"
+          end
+        end
+
+        # Suggest appropriate override environment variable
+        def suggest_override_variable
+          if current_version.include?('-pre')
+            if current_minor.positive?
+              suggested_version = "#{current_major}.#{current_minor - 1}.0"
+              "export QA_PREVIOUS_MINOR_OVERRIDE=#{suggested_version}"
+            else
+              suggested_version = "#{current_major - 1}.12.0"
+              "export QA_PREVIOUS_MAJOR_OVERRIDE=#{suggested_version}"
+            end
+          else
+            "export QA_PREVIOUS_MINOR_OVERRIDE=<version>"
+          end
+        end
+
+        # Log helpful information when using fallback logic
+        def log_fallback_info(upgrade_type, missing_version)
+          separator = "-" * 60
+
+          logger.warn(<<~WARNING.strip)
+            #{separator}
+            🚨 PRE-RELEASE VERSION FALLBACK ACTIVATED
+            #{separator}
+
+            Target #{upgrade_type} version #{missing_version} not found for pre-release #{current_version}
+
+            This is NORMAL during GitLab's monthly release cycle!
+
+            • Reason: #{missing_version} hasn't been released to Docker Hub yet
+            • Action: Falling back to older available version
+            • Impact: Tests will run against older version (still valid)
+
+            To override this behavior, set:
+            #{suggest_override_variable}
+
+            Or check available versions:
+            https://hub.docker.com/r/gitlab/gitlab-#{edition}/tags
+
+            #{separator}
+          WARNING
         end
       end
     end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '15.7.0'
+    VERSION = '15.7.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 15.7.0
+  version: 15.7.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control