gitlab-qa 14.17.0 → 14.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a30b8f1d5f38d5c3b4a48d7b1395387b4cc854e5e2ec579d3591777b7131c84
-  data.tar.gz: 9da397c19c29ea43b5fce2b8ad441d09dbd203adfcb122aa7ac75cc707f65245
+  metadata.gz: 2aca04edea5cc1cf803513ed9d4bab1ed4d73ce2126e244e1d166ddce1c8cf1c
+  data.tar.gz: 5e5a38423e70530828c6a86a368c6825d5247808d799fcf38c195992d1a25bb7
 SHA512:
-  metadata.gz: 1eba615ae509dc1425e85375e726604a160c05edd7c69e0bbe86d65ad7a638fdc8f062633463b442e77e6d11b4693d5c6e2738a97385b168108be1c18ac1187c
-  data.tar.gz: 3c4a0c7c9375199ff84c86c8d2d8a2d9b8eaf93094708ea7be80ad53f98a3ee8a46807364d13ad0a7b57c45f0e06d85087b23915d78549b4baf21f5a4a810044
+  metadata.gz: 87668dd869f1100e6a78df1273934026960903a5de2fd36c53c54be61783a61cdc798d0baa908e82d5e9b6dcf9100e147fdf3d1343afe476b2c9e042f74b7d57
+  data.tar.gz: e47a1c57792a1f697eec41709ffdaef17c27284b9b3c918648d850dee3d968c63783b5e3c1cd87e1b15c832c6df92a2d32f0e2f796db14fd36f03a59e369fd57

data/Gemfile.lock

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

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

@@ -26,8 +26,31 @@ module Gitlab
         #
         # @return [Array<QA::Release>]
         def fetch
-          return [release(latest_patch(previous_version))] unless major_upgrade?
+          return minor_upgrade_path unless major_upgrade?
 
+          major_upgrade_path
+        rescue GitlabVersionInfo::VersionNotFoundError
+          logger.error("Failed to construct gitlab upgrade path")
+          raise
+        end
+
+        private
+
+        delegate :latest_patch, to: :version_info
+
+        attr_reader :version_info, :current_version, :semver_component, :edition, :logger
+
+        # Upgrade path from previous minor version
+        #
+        # @return [Array]
+        def minor_upgrade_path
+          [release(latest_patch(previous_version))]
+        end
+
+        # Upgrade path from previous major version
+        #
+        # @return [Array]
+        def major_upgrade_path
           # get versions between previous major and current version in gitlab upgrade path
           path = full_upgrade_path.each_with_object([]) do |ver, arr|
             next if ver <= previous_version || ver >= current_version
@@ -40,12 +63,6 @@ module Gitlab
           end
         end
 
-        private
-
-        delegate :latest_patch, to: :version_info
-
-        attr_reader :version_info, :current_version, :semver_component, :edition, :logger
-
         # Upgrade from previous major
         #
         # @return [Boolean]

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

@@ -48,7 +48,9 @@ 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}\./) }
+          versions.find { |ver| ver.to_s.match?(/^#{version}\./) }.tap do |ver|
+            raise_version_not_found("Latest patch version for version #{version}") unless ver
+          end
         end
 
         private
@@ -103,8 +105,9 @@ 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}/) } ||
-            raise(VersionNotFoundError, "Previous minor version for current version #{current_version} not available on Dockerhub (yet)")
+          versions.find { |version| version.to_s.match?(/^#{current_major}\.#{current_minor - 1}/) }.tap do |ver|
+            raise_version_not_found("Previous minor version for current version #{current_version}") unless ver
+          end
         end
 
         # Previous first minor version
@@ -204,6 +207,10 @@ module Gitlab
 
           [matching_tags, more_data]
         end
+
+        def raise_version_not_found(error_prefix)
+          raise(VersionNotFoundError, "#{error_prefix} not available on Dockerhub (yet)")
+        end
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.17.0'
+    VERSION = '14.18.0'
   end
 end

data/support/setup/gitlab_duo_setup.rb

@@ -9,6 +9,11 @@ class GitlabDuoSetup
 
       return unless enabled?('HAS_ADD_ON')
 
+      # The seat links endpoint in CustomersDot is rate limited and can sometimes
+      # prevent the service access token from being generated during license activation
+      # This generates the token directly, similar to the sync_service_token_worker cron job
+      generate_service_access_token
+
       # Due to the various async Sidekiq processes involved, we wait to verify
       # that the service access token has been generated before proceeding
       verify_service_access_token
@@ -31,6 +36,12 @@ class GitlabDuoSetup
       end
     end
 
+    def generate_service_access_token
+      puts 'Generating service access token...'
+
+      ::CloudConnector::SyncServiceTokenWorker.perform_async(license_id: License.current.id)
+    end
+
     def token_count
       ::CloudConnector::ServiceAccessToken.active.count
     end

metadata

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