gitlab-qa 14.0.2 → 14.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06cdfb404230f5d597a2ec654c113514737824c05c4d07076e13920514f6ee50
-  data.tar.gz: 8ce3ef6d3d4409339365f6e5eea40b13c0e92bd956ece9817abbd915286c655c
+  metadata.gz: 8ff023809865275353e982f054758e26847e64a9e1f710a73700c87c16d43129
+  data.tar.gz: dd0797b89d5b161161890fb5f0648c960e4e5f15209a8dabffe57bcf982c95eb
 SHA512:
-  metadata.gz: 46dbfd8867ba9a3cb19a0909a63973931a8050da8a3fdfb5fc83872385ce2c022cb742caa4c7c27740ecbe1c026529e01991c8d2bc89a6ef91cc592047b3b2a0
-  data.tar.gz: 9f74fe0c15e67021261ec6941499b8f8a5f8c6da730fa150910442ce8c3a01a081aad08e0c580090353c5548795ac089fc8bab19104fe64af47ab198a71cfffb
+  metadata.gz: 810852861df35f09e0faccbca9d5ce89d78439a94d57a5bb53709f2efbac07b45ea75be8a1c9edf1fc2a552a539e81932d31016f62af042b68d3eb2552aa466b
+  data.tar.gz: 4b08122b7343ba7a62893cb88e8b1166476cc148af4a2b86b0168fcfbdf1cfb1dab493965ac11142768b9298c7b5a516b86f6d609f1785469f63cc6f23ed120e

data/.gitignore

@@ -14,3 +14,5 @@
 .tool-versions
 # ignore built gems
 *.gem
+.vscode/task.json
+.vscode/

data/Gemfile.lock

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

data/lib/gitlab/qa/component/gitlab.rb

@@ -188,10 +188,39 @@ module Gitlab
           )
         end
 
+        # Path of the log file to write to
+        # @note
+        #   if an error occurs during #reconfigure,
+        #   "retry-{n}" is prefixed to the file name where {n} is retry number
+        # @return [String] the path to the log file
+        def log_file
+          retries = 0
+          log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-reconfigure-logs.txt"
+          while File.exist?(log_file)
+            break unless File.exist?(log_file)
+
+            retries += 1
+            log_file = "#{Runtime::Env.host_artifacts_dir}/#{name}-retry-#{retries}-reconfigure-logs.txt"
+          end
+
+          log_file
+        end
+
+        private :log_file
+
         def reconfigure
           setup_omnibus
-
+          log_file_path = log_file
+          config_file = File.open(log_file_path, "w")
           @docker.attach(name) do |line, _wait|
+            config_file.write(line, mode: 'a')
+
+            if line.include?('There was an error running gitlab-ctl reconfigure')
+              Runtime::Logger.error(
+                "Failure while running gitlab-ctl reconfigure command. Please check the #{log_file_path} in the artefact for more info"
+              )
+            end
+
             # TODO, workaround which allows to detach from the container
             break if line.include?('gitlab Reconfigured!')
           end

data/lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb

@@ -53,12 +53,17 @@ module Gitlab
             def update(rspec_args)
               Docker::Volumes.new.with_temporary_volumes do |volumes|
                 # deploy first release in upgrade path and run specs to populate db
+                Runtime::Logger.info("Running the first release in upgrade path: #{upgrade_path.first}")
                 run_gitlab(upgrade_path.first, volumes, ["--", "--tag", "smoke"])
 
                 # deploy releases in upgrade path
-                upgrade_path[1..].each { |release| run_gitlab(release, volumes, skip_setup: true) }
+                upgrade_path[1..].each do |release|
+                  Runtime::Logger.info("Upgrading GitLab to release: #{release}")
+                  run_gitlab(release, volumes, skip_setup: true)
+                end
 
                 # deploy current release and run tests
+                Runtime::Logger.info("Upgrading GitLab to current release: #{current_release}")
                 run_gitlab(current_release, volumes, rspec_args, skip_setup: true)
               end
             end
@@ -94,7 +99,10 @@ module Gitlab
             # @param [Gitlab::QA::Release] release
             # @param [Array] rspec_args
             # @return [void]
-            def run_specs(gitlab, release, rspec_args)
+            def run_specs(gitlab, release, rspec_args) # rubocop:disable Metrics/AbcSize
+              Runtime::Logger.info("Running smoke test to verify update and seed data in environment") unless upgrade_path.first != release
+              Runtime::Logger.info("Running smoke test to verify update") unless current_release != release
+
               Component::Specs.perform do |specs|
                 specs.release = release
                 specs.suite = 'Test::Instance::All'
@@ -105,7 +113,10 @@ module Gitlab
                 specs.env = { 'QA_GENERATE_ALLURE_REPORT' => false } unless release == current_release
               end
             rescue Support::ShellCommand::StatusError => e
-              raise e if release == current_release # only fail on current release
+              if release == current_release # only fail on current release
+                Runtime::Logger.error("Failed to run test suite after final upgrade to release '#{release}'")
+                raise e
+              end
 
               Runtime::Logger.warn("Test run for release '#{gitlab.release}' finished with errors!")
             end

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

@@ -68,7 +68,7 @@ module Gitlab
         #
         # @return [void]
         def fail!
-          logger.error("Shell command output:\n#{string_output}") unless stream_output
+          logger.error("Shell command output:\n#{string_output}") unless @command.include?("docker attach") || stream_output
           raise StatusError, "Command `#{mask_secrets(command).truncate(100)}` failed! " + "✘".red
         end
 

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.0.2'
+    VERSION = '14.2.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.2
+  version: 14.2.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control