gitlab-qa 15.7.1 → 15.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283e2b2d77e4f2a18d03c454e268b88d4bcaba6662086efe37f2045fd5a2efca
-  data.tar.gz: a7ca80f1ba2e9244c7b6046d47e5b154278fe062774583e8874f1da6956890e7
+  metadata.gz: e2f5e12b0e4b1d6949c3bf2ac7b988ab0f4b42a1c9e039828da20d0611f0e284
+  data.tar.gz: c41f28650cf5a9da55dbe1e97b6c9d4d04f08457e8d19f57982ecf193879603a
 SHA512:
-  metadata.gz: 77c08d80779857be0baf10a0e1690d8c96e6c107a467f7005ec1f4714ffda321e54a1bab4713a79e52570d9403e8bde33ba7b9b74c135d009a2df590cc904322
-  data.tar.gz: b70bc89223d607c828ecacc91b3d433f9a38a420929ca95a97d0a6574618c921e457ca58164353b30574e3a6eb7165cc3a4a6623e45d6672ef178b0a0bc795e6
+  metadata.gz: afdb8a6544dd8aa320f1b076d16ce0aa6dc453e014f3bf8b7b30fd1b29a2abd0d1d99df34755ae4812e9bc1c83da7d154a7bfdc7a68894a1d2ef71b8bfacc17a
+  data.tar.gz: 6ddd0641fe2d3cf5e5f63915854bea06b4fac93ec18d2f6651f85dbd581621aa952741d35575f4ee56b91709c383c2c12318825e8250345857ff16c4930f086a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (15.7.1)
+    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/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '15.7.1'
+    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.1
+  version: 15.7.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-20 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control