gitlab-qa 14.16.0 → 14.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98b613be98b09d382003ce5a1bd4562bddf7a7e0216de30a76c0c264c51a973
-  data.tar.gz: 808ee2237ccbcabe62430f504b99a1c39930e90ccaff107d7316ce8a7ee71f52
+  metadata.gz: 9a30b8f1d5f38d5c3b4a48d7b1395387b4cc854e5e2ec579d3591777b7131c84
+  data.tar.gz: 9da397c19c29ea43b5fce2b8ad441d09dbd203adfcb122aa7ac75cc707f65245
 SHA512:
-  metadata.gz: edff13e29e9dc6cdda84b1cf8103676e5b74703a45fd6a7a77d34cc5b7f5b1fa836957e130806c263864c2ee659bb7f7cd9c9620e0f97c8c5cce0b756b7b2c60
-  data.tar.gz: 45ef2a7609d5e2345a4ca25067cb722098fe0ec734b9ab18ebf5513bf1af45d87f0a755f91ae0c4b2e10329a809e72c25f81df2c293aaadcc5dc89c763c07f6d
+  metadata.gz: 1eba615ae509dc1425e85375e726604a160c05edd7c69e0bbe86d65ad7a638fdc8f062633463b442e77e6d11b4693d5c6e2738a97385b168108be1c18ac1187c
+  data.tar.gz: 3c4a0c7c9375199ff84c86c8d2d8a2d9b8eaf93094708ea7be80ad53f98a3ee8a46807364d13ad0a7b57c45f0e06d85087b23915d78549b4baf21f5a4a810044

data/Gemfile.lock

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

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

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class DuoProSetup
+require 'active_support/core_ext/object/blank'
+
+class GitlabDuoSetup
   class << self
     def configure!
       activate_cloud_license
@@ -11,7 +13,7 @@ class DuoProSetup
       # 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 +31,31 @@ class DuoProSetup
       end
     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 +71,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.17.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-10-10 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