gitlab-qa 14.0.1 → 14.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e82e5e8777aac74ac46ccdc60d9fdc8df5c4136523c92d8f5fd88ab21f25c86
-  data.tar.gz: 5c6e6cff8abd9abe2b8442e9d41718a6f5af17ce01b70770e075490d8d0d8ca9
+  metadata.gz: acdd50bfdfe882c975ccd807c9215a3b3e598e15427a05046a0775940b5a7246
+  data.tar.gz: f1b20ae89321a207ff4d53c00f1207344236e610eecfd30a65498ea714e672d1
 SHA512:
-  metadata.gz: f89a050668380aea6fe6032eedd280f4a51b6163c920f31d4fecd4596b3a7a077f037ef6196d7a8e86f77c1df56c80f4e80ea9857b81c74573bdad79c05a9d1e
-  data.tar.gz: b2ec3b5c597de4d3fcdb320e4351c3df2d6f4fb62916479f03005a9680d79250defaa331dd14deea03d657384cf05a1a16909463493fe3600d7e3df87690c0a3
+  metadata.gz: 2035dd020578666e40deb9cbfb0296f63599dcd3bd5187ccc8a8a72b9c73fbaa4649e9b9de31166393749bab2441fa2b4dd6980363892c612dad3ed2d99ce7b5
+  data.tar.gz: 56b89359923d019df2f2383fe4629105311d5ee9c9030827cc61f89dad20502ef1897a9e7fc03ac93b03c935e33122a25a3ba8d482bf56eac2182c3be5229f82

data/.gitlab/merge_request_templates/Default.md

@@ -41,6 +41,7 @@ Example below:
 
 This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability. 
 
+* [ ] Commits include `Changelog:` [trailer](https://docs.gitlab.com/ee/development/changelog.html)
 * [ ] I have evaluated the [MR acceptance checklist](https://docs.gitlab.com/ee/development/code_review.html#acceptance-checklist) for this MR.
 
 /label ~QA ~Quality

data/.gitlab/merge_request_templates/Release.md

@@ -2,7 +2,7 @@
 commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
 ## Diff
 
-https://gitlab.com/gitlab-org/gitlab-qa/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
+https://gitlab.com/gitlab-org/gitlab-qa/-/compare/<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
 ## Pre-merge checklist
 

data/Gemfile.lock

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

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

@@ -40,7 +40,7 @@ module Gitlab
               gitlab.name = 'gitlab'
               gitlab.network = @network
 
-              gitlab.omnibus_gitlab_rails_env['CODE_SUGGESTIONS_BASE_URL'] = "http://#{@ai_gateway_hostname}:#{@ai_gateway_port}"
+              gitlab.omnibus_gitlab_rails_env['AI_GATEWAY_URL'] = "http://#{@ai_gateway_hostname}:#{@ai_gateway_port}"
 
               gitlab.set_ee_activation_code
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.0.1'
+    VERSION = '14.1.0'
   end
 end

data/support/setup/code_suggestions_setup.rb

@@ -3,26 +3,28 @@
 class CodeSuggestionsSetup
   class << self
     def configure!
-      puts 'Enabling code_suggestions_tokens_api feature flag...'
-      Feature.enable(:code_suggestions_tokens_api)
-
       activate_cloud_license
 
       # Due to the various async Sidekiq processes involved, we wait to verify
       # that the code suggestions access token has been generated before proceeding
       verify_code_suggestions_access_token
 
+      # TODO: Remove after service start date
+      # This toggle will no longer be used to control access to code suggestions
+      # See https://gitlab.com/gitlab-org/gitlab/blob/master/ee/app/policies/ee/global_policy.rb#L62
       puts 'Enabling application setting instance_level_code_suggestions_enabled...'
       ApplicationSetting.last.update(instance_level_code_suggestions_enabled: true)
+
+      assign_code_suggestions_seat_to_admin
     end
 
     private
 
     def activate_cloud_license
       puts 'Activating cloud license...'
-      activation_result = ::GitlabSubscriptions::ActivateService.new.execute(ENV.fetch('QA_EE_ACTIVATION_CODE', nil))
+      result = ::GitlabSubscriptions::ActivateService.new.execute(ENV.fetch('QA_EE_ACTIVATION_CODE', nil))
 
-      if activation_result[:success]
+      if result[:success]
         puts 'Cloud license activation successful'
       else
         puts 'Cloud license activation failed!'
@@ -48,6 +50,26 @@ class CodeSuggestionsSetup
       puts "Failed to create code suggestions access token after #{max_attempts} attempts"
       exit 1
     end
+
+    def assign_code_suggestions_seat_to_admin
+      puts 'Assigning code suggestions seat to admin...'
+
+      admin = User.find_by(username: 'root')
+      add_on = GitlabSubscriptions::AddOnPurchase.find_by(add_on: GitlabSubscriptions::AddOn.code_suggestions.last)
+
+      result = ::GitlabSubscriptions::UserAddOnAssignments::SelfManaged::CreateService.new(
+        add_on_purchase: add_on, user: admin
+      ).execute
+
+      if result.is_a?(ServiceResponse) && result[:status] == :success
+        puts 'Seat assignment for admin successful'
+      else
+        puts 'Seat assignment for admin failed!'
+
+        error = result.is_a?(ServiceResponse) ? result[:message] : result
+        puts error
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 14.1.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control