gitlab-qa 14.16.0 → 14.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98b613be98b09d382003ce5a1bd4562bddf7a7e0216de30a76c0c264c51a973
-  data.tar.gz: 808ee2237ccbcabe62430f504b99a1c39930e90ccaff107d7316ce8a7ee71f52
+  metadata.gz: 2aca04edea5cc1cf803513ed9d4bab1ed4d73ce2126e244e1d166ddce1c8cf1c
+  data.tar.gz: 5e5a38423e70530828c6a86a368c6825d5247808d799fcf38c195992d1a25bb7
 SHA512:
-  metadata.gz: edff13e29e9dc6cdda84b1cf8103676e5b74703a45fd6a7a77d34cc5b7f5b1fa836957e130806c263864c2ee659bb7f7cd9c9620e0f97c8c5cce0b756b7b2c60
-  data.tar.gz: 45ef2a7609d5e2345a4ca25067cb722098fe0ec734b9ab18ebf5513bf1af45d87f0a755f91ae0c4b2e10329a809e72c25f81df2c293aaadcc5dc89c763c07f6d
+  metadata.gz: 87668dd869f1100e6a78df1273934026960903a5de2fd36c53c54be61783a61cdc798d0baa908e82d5e9b6dcf9100e147fdf3d1343afe476b2c9e042f74b7d57
+  data.tar.gz: e47a1c57792a1f697eec41709ffdaef17c27284b9b3c918648d850dee3d968c63783b5e3c1cd87e1b15c832c6df92a2d32f0e2f796db14fd36f03a59e369fd57

data/Gemfile.lock

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

data/docs/what_tests_can_be_run.md

@@ -1196,7 +1196,7 @@ The following `AiGateway` scenarios spin up a GitLab Omnibus instance integrated
 
 All scenarios below require the following environment variables, **_unless otherwise noted:_**
 
-- `QA_EE_ACTIVATION_CODE`: An activation code for a Staging-generated Premium or Ultimate cloud license with a purchased Duo Pro add-on. This can be found in the GitLab QA 1Password vault.
+- `QA_EE_ACTIVATION_CODE`: An activation code for a Staging-generated Premium or Ultimate cloud license with a purchased Duo Pro or Duo Enterprise add-on. This can be found in the GitLab QA 1Password vault.
 - `GITLAB_LICENSE_MODE`: Set to `test` in order to configure GitLab Omnibus with the correct license mode and `CUSTOMER_PORTAL_URL`.
 
 Example:
@@ -1211,7 +1211,7 @@ $ export GITLAB_LICENSE_MODE="test"
 #### `Test::Integration::AiGateway EE|<full image address>`
 
 - Runs tests tagged with `:ai_gateway`
-- GitLab instance has a cloud license + Duo Pro add-on, and a seat is assigned to the admin user
+- GitLab instance has a cloud license with either a Duo Pro add-on or Duo Enterprise add-on, and a seat is assigned to the admin user. Choose Duo Enterprise over Duo Pro when available.
 
 Example:
 
@@ -1224,7 +1224,7 @@ $ gitlab-qa Test::Integration::AiGateway EE
 #### `Test::Integration::AiGatewayNoSeatAssigned EE|<full image address>`
 
 - Runs tests tagged with `:ai_gateway_no_seat_assigned`
-- GitLab instance has a cloud license + Duo Pro add-on, but no seat is assigned to the admin user
+- GitLab instance has a cloud license + Duo Pro or Duo Enterprise add-on, but no seat is assigned to the admin user.
 
 Example:
 
@@ -1237,11 +1237,11 @@ $ gitlab-qa Test::Integration::AiGatewayNoSeatAssigned EE
 #### `Test::Integration::AiGatewayNoAddOn EE|<full image address>`
 
 - Runs tests tagged with `:ai_gateway_no_add_on`
-- GitLab instance has a cloud license without a Duo Pro add-on, and no seat is assigned to the admin user
+- GitLab instance has a cloud license without a Duo Pro or Duo Enterprise add-on, and no seat is assigned to the admin user.
 
 **Regarding environment variables:**
 
-- `QA_EE_ACTIVATION_CODE` should be set to a Staging-generated Premium or Ultimate cloud license _without_ a Duo Pro add-on.
+- `QA_EE_ACTIVATION_CODE` should be set to a Staging-generated Premium or Ultimate cloud license _without_ a Duo Pro or Duo Enterprise add-on.
 
 Example:
 

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

@@ -28,7 +28,7 @@ module Gitlab
 
                   ai_gateway.instance do
                     gitlab.instance do
-                      set_up_duo_pro(gitlab) if @use_cloud_license
+                      set_up_gitlab_duo(gitlab) if @use_cloud_license
                       run_specs(gitlab, *rspec_args)
                     end
                   end
@@ -55,14 +55,14 @@ module Gitlab
               ai_gateway.configure_environment(gitlab_hostname: gitlab_hostname)
             end
 
-            def set_up_duo_pro(gitlab)
-              Runtime::Logger.info('Setting up Duo Pro on GitLab instance')
+            def set_up_gitlab_duo(gitlab)
+              Runtime::Logger.info('Setting up Gitlab Duo on GitLab instance')
 
               gitlab.docker.copy(gitlab.name, SETUP_SRC_PATH, SETUP_DEST_PATH)
 
               gitlab.docker.exec(
                 gitlab.name,
-                "ASSIGN_SEATS=#{@assign_seats} HAS_ADD_ON=#{@has_add_on} gitlab-rails runner #{SETUP_DEST_PATH}/duo_pro_setup.rb",
+                "ASSIGN_SEATS=#{@assign_seats} HAS_ADD_ON=#{@has_add_on} gitlab-rails runner #{SETUP_DEST_PATH}/gitlab_duo_setup.rb",
                 mask_secrets: gitlab.secrets
               )
             end

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.16.0'
+    VERSION = '14.18.0'
   end
 end

data/support/setup/{duo_pro_setup.rb → gitlab_duo_setup.rb}

@@ -1,17 +1,24 @@
 # frozen_string_literal: true
 
-class DuoProSetup
+require 'active_support/core_ext/object/blank'
+
+class GitlabDuoSetup
   class << self
     def configure!
       activate_cloud_license
 
       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
 
-      assign_duo_pro_seat_to_admin if enabled?('ASSIGN_SEATS')
+      assign_duo_seat_to_admin if enabled?('ASSIGN_SEATS')
     end
 
     private
@@ -29,32 +36,37 @@ class DuoProSetup
       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
+
     def verify_service_access_token
       puts 'Waiting for service access token to be available...'
 
       max_attempts = 3
       attempts = 0
 
-      until (tokens = ::CloudConnector::ServiceAccessToken.active.count)&.positive? || attempts == max_attempts
+      until token_count&.positive? || attempts == max_attempts
         puts 'Attempting to verify access token exists...'
         attempts += 1
         sleep 30
       end
 
-      return if tokens&.positive?
+      return if token_count&.positive?
 
       puts "Failed to create service access token after #{max_attempts} attempts"
       exit 1
     end
 
-    def assign_duo_pro_seat_to_admin
-      puts 'Assigning Duo Pro seat to admin...'
-
-      admin = User.find_by(username: 'root')
-      add_on = GitlabSubscriptions::AddOnPurchase.find_by(add_on: GitlabSubscriptions::AddOn.code_suggestions.last)
-
+    def assign_duo_seat_to_admin
       result = ::GitlabSubscriptions::UserAddOnAssignments::SelfManaged::CreateService.new(
-        add_on_purchase: add_on, user: admin
+        add_on_purchase: add_on_purchase, user: admin
       ).execute
 
       if result.is_a?(ServiceResponse) && result[:status] == :success
@@ -70,7 +82,33 @@ class DuoProSetup
     def enabled?(key, default: nil)
       ENV.fetch(key, default) == 'true'
     end
+
+    def find_add_on_purchase(add_on:)
+      GitlabSubscriptions::AddOnPurchase.find_by(add_on: add_on)
+    end
+
+    def duo_pro_add_on
+      find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.code_suggestions.last)
+    end
+
+    def duo_enterprise_add_on
+      find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.duo_enterprise.last)
+    end
+
+    def admin
+      User.find_by(username: 'root')
+    end
+
+    def add_on_purchase
+      if duo_enterprise_add_on.present?
+        puts 'Assigning Duo Enterprise seat to admin...'
+        duo_enterprise_add_on
+      else
+        puts 'Assigning Duo Pro seat to admin...'
+        duo_pro_add_on
+      end
+    end
   end
 end
 
-DuoProSetup.configure!
+GitlabDuoSetup.configure!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.16.0
+  version: 14.18.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -502,7 +502,7 @@ files:
 - support/manifests/suggested_reviewer/pubsub.yaml
 - support/manifests/suggested_reviewer/recommender-bot.yaml
 - support/manifests/suggested_reviewer/recommender.yaml
-- support/setup/duo_pro_setup.rb
+- support/setup/gitlab_duo_setup.rb
 - tls_certificates/authority/ca.crt
 - tls_certificates/authority/ca.key
 - tls_certificates/authority/ca.pem