gitlab-qa 14.1.0 → 14.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acdd50bfdfe882c975ccd807c9215a3b3e598e15427a05046a0775940b5a7246
-  data.tar.gz: f1b20ae89321a207ff4d53c00f1207344236e610eecfd30a65498ea714e672d1
+  metadata.gz: 4fbdad805d2a329e5680370ec5873a1d6eab6c63a86e699dd27c0f1f87acbda0
+  data.tar.gz: 6a7ef31aca034df274e9acc8e0e5fd333d17b7d16bd8d5a2f4d19d2d32d46cd6
 SHA512:
-  metadata.gz: 2035dd020578666e40deb9cbfb0296f63599dcd3bd5187ccc8a8a72b9c73fbaa4649e9b9de31166393749bab2441fa2b4dd6980363892c612dad3ed2d99ce7b5
-  data.tar.gz: 56b89359923d019df2f2383fe4629105311d5ee9c9030827cc61f89dad20502ef1897a9e7fc03ac93b03c935e33122a25a3ba8d482bf56eac2182c3be5229f82
+  metadata.gz: 9815bfe1067fdc4e39b0b620582ed935dc87a37335652397de7725175b2e39f270abc0d9e97c6177bdfa8fce74ad29a280cea160b6fe25dc788d306e1e733bff
+  data.tar.gz: 2eea71cf51311871291ccef7ae12a43b9a644f6200f36bd19ec7fc32876cfa58cc145e0e13b4847b3e7aa1a2a362ded548b140ecca6c1c3e9354842003a587e2

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.1.0)
+    gitlab-qa (14.2.1)
       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/runtime/omnibus_configurations/object_storage_aws.rb

@@ -11,7 +11,7 @@ module Gitlab
             <<~OMNIBUS
               gitlab_rails['object_store']['enabled'] = true
               gitlab_rails['object_store']['proxy_download'] = false
-              gitlab_rails['object_store']['connection'] = { 'provider' => 'AWS', 'region' => '#{Runtime::Env.aws_s3_region}', 'aws_access_key_id' => '#{Runtime::Env.aws_s3_key_id}', 'aws_secret_access_key' => '#{Runtime::Env.aws_s3_access_key}' }
+              gitlab_rails['object_store']['connection'] = { 'provider' => 'AWS', 'region' => '$AWS_S3_REGION', 'aws_access_key_id' => '$AWS_S3_KEY_ID', 'aws_secret_access_key' => '$AWS_S3_ACCESS_KEY' }
 
               gitlab_rails['object_store']['objects']['artifacts']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
               gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'

data/lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb

@@ -13,7 +13,7 @@ module Gitlab
             json_key = setup_json_key
 
             <<~OMNIBUS
-              gitlab_rails['object_store']['connection'] = { 'provider' => 'Google', 'google_project' => '#{Runtime::Env.google_project}', 'google_client_email' => '#{Runtime::Env.google_client_email}', 'google_json_key_location' => '#{json_key.path}' }
+              gitlab_rails['object_store']['connection'] = { 'provider' => 'Google', 'google_project' => '$GOOGLE_PROJECT', 'google_client_email' => '$GOOGLE_CLIENT_EMAIL', 'google_json_key_location' => '#{json_key.path}' }
 
               gitlab_rails['object_store']['objects']['artifacts']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
               gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'

data/lib/gitlab/qa/runtime/omnibus_configurations/registry_object_storage.rb

@@ -9,7 +9,7 @@ module Gitlab
             Runtime::Env.require_aws_s3_environment!
 
             <<~OMNIBUS
-              registry['storage'] = { 's3' => { 'accesskey' => '#{Runtime::Env.aws_s3_key_id}', 'secretkey' => '#{Runtime::Env.aws_s3_access_key}', 'bucket' => '#{Runtime::Env.aws_s3_bucket_name}', 'region' => '#{Runtime::Env.aws_s3_region}' } }
+              registry['storage'] = { 's3' => { 'accesskey' => '$AWS_S3_KEY_ID', 'secretkey' => '$AWS_S3_ACCESS_KEY', 'bucket' => '$AWS_S3_BUCKET_NAME', 'region' => '#{Runtime::Env.aws_s3_region}' } }
             OMNIBUS
           end
         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.1.0'
+    VERSION = '14.2.1'
   end
 end

metadata

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