gitlab-qa 7.34.0 → 8.0.0

data/lib/gitlab/qa/docker/shellout.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
-require 'rainbow/refinement'
+require 'active_support/core_ext/string/filters'
 
 module Gitlab
   module QA
@@ -17,16 +17,16 @@ module Gitlab
           @logger = Runtime::Logger.logger
         end
 
-        attr_reader :command, :logger
+        attr_reader :command, :output
 
         def execute! # rubocop:disable Metrics/AbcSize
-          raise StatusError, 'Command already executed' if @output.any?
+          raise StatusError, 'Command already executed' if output.any?
 
-          logger.info("Docker shell command: `#{@command.mask_secrets.cyan}`")
+          logger.info("Docker shell command: `#{command.mask_secrets.cyan}`")
 
           Open3.popen2e(@command.to_s) do |_in, out, wait|
             out.each do |line|
-              @output.push(line)
+              output.push(line)
 
               if stream_progress
                 print "."
@@ -36,21 +36,28 @@ module Gitlab
 
               yield line, wait if block_given?
             end
-            puts if stream_progress
+            puts if stream_progress && !output.empty?
 
-            if wait.value.exited? && wait.value.exitstatus.nonzero?
-              logger.error("Docker shell command output:\n#{output}") unless command.stream_output
-              raise StatusError, "Docker command `#{@command.mask_secrets[0..100]}` failed! ✘"
-            end
+            fail! if wait.value.exited? && wait.value.exitstatus.nonzero?
 
-            logger.debug("Docker shell command output:\n#{output}") unless command.stream_output || output.empty?
+            logger.debug("Docker shell command output:\n#{string_output}") unless command.stream_output || output.empty?
           end
 
-          output
+          string_output
         end
 
         private
 
+        attr_reader :logger
+
+        # Raise error and print output to error log level
+        #
+        # @return [void]
+        def fail!
+          logger.error("Docker shell command output:\n#{string_output}") unless command.stream_output
+          raise StatusError, "Docker command `#{command.mask_secrets.truncate(100)}` failed! " + "✘".red
+        end
+
         # Stream only command execution progress and log output when command finished
         #
         # @return [Boolean]
@@ -58,8 +65,11 @@ module Gitlab
           !(Runtime::Env.ci || command.stream_output)
         end
 
-        def output
-          @output.join.chomp
+        # Stringified command output
+        #
+        # @return [String]
+        def string_output
+          output.join.chomp
         end
       end
     end

data/lib/gitlab/qa/docker/volumes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 
 module Gitlab
@@ -7,7 +9,7 @@ module Gitlab
         VOLUMES = { 'config' => '/etc/gitlab',
                     'data' => '/var/opt/gitlab' }.freeze
 
-        QA_CONTAINER_WORKDIR = '/home/gitlab/qa'.freeze
+        QA_CONTAINER_WORKDIR = '/home/gitlab/qa'
 
         def initialize(volumes = VOLUMES)
           @volumes = volumes

data/lib/gitlab/qa/release.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     class Release
@@ -49,10 +51,10 @@ module Gitlab
         \z
       /xi
 
-      DEFAULT_TAG = 'latest'.freeze
-      DEFAULT_CANONICAL_TAG = 'nightly'.freeze
-      DEV_REGISTRY = 'dev.gitlab.org:5005'.freeze
-      COM_REGISTRY = 'registry.gitlab.com'.freeze
+      DEFAULT_TAG = 'latest'
+      DEFAULT_CANONICAL_TAG = 'nightly'
+      DEV_REGISTRY = 'dev.gitlab.org:5005'
+      COM_REGISTRY = 'registry.gitlab.com'
 
       InvalidImageNameError = Class.new(RuntimeError)
 

data/lib/gitlab/qa/report/prepare_stage_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module Gitlab

data/lib/gitlab/qa/report/summary_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'table_print'
 

data/lib/gitlab/qa/report/update_screenshot_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'json'
 require 'active_support/core_ext/object/blank'

data/lib/gitlab/qa/reporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 
 module Gitlab

data/lib/gitlab/qa/runtime/env.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/object/blank'
 require 'securerandom'
-require 'rainbow/refinement'
 
 module Gitlab
   module QA
@@ -142,7 +143,9 @@ module Gitlab
           attr_writer(method_name)
 
           define_method(method_name) do
-            env_var_value_if_defined(env_name) || (instance_variable_get("@#{method_name}") if instance_variable_defined?("@#{method_name}"))
+            env_var_value_if_defined(env_name) || (if instance_variable_defined?("@#{method_name}")
+                                                     instance_variable_get("@#{method_name}")
+                                                   end)
           end
         end
 
@@ -220,11 +223,13 @@ module Gitlab
         end
 
         def host_artifacts_dir
-          @host_artifacts_dir ||= File.join(env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id)
+          @host_artifacts_dir ||= File.join(
+            env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id
+          )
         end
 
         def elastic_version
-          env_var_value_if_defined('ELASTIC_VERSION') || '7.17.0'.freeze
+          env_var_value_if_defined('ELASTIC_VERSION') || '8.2.0'
         end
 
         def require_license!

data/lib/gitlab/qa/scenario/actable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/cli_commands.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario
       module CLICommands
-        GIT_LFS_VERSION = '2.8.0'.freeze
+        GIT_LFS_VERSION = '2.8.0'
 
         def self.git_lfs_install_commands
           [

data/lib/gitlab/qa/scenario/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/any.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/preprod.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/relative_url.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/release.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/smoke.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_ref.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab
@@ -8,12 +10,12 @@ module Gitlab
           class LDAP < Scenario::Template
             LDAP_PORT = 389
             LDAP_TLS_PORT = 636
-            BASE_DN = 'dc=example,dc=org'.freeze
-            BIND_DN = 'cn=admin,dc=example,dc=org'.freeze
-            GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'.freeze
-            ADMIN_GROUP = 'AdminGroup'.freeze
-            ADMIN_USER = 'admin'.freeze
-            ADMIN_PASSWORD = 'admin'.freeze
+            BASE_DN = 'dc=example,dc=org'
+            BIND_DN = 'cn=admin,dc=example,dc=org'
+            GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'
+            ADMIN_GROUP = 'AdminGroup'
+            ADMIN_USER = 'admin'
+            ADMIN_PASSWORD = 'admin'
 
             attr_reader :gitlab_name, :spec_suite, :tls, :ldap_name, :network, :orchestrate_ldap_server
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'fileutils'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'fileutils'
 

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'net/http'
 require 'cgi'

data/lib/gitlab/qa/slack/post_to_slack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Slack

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'uri'
 
@@ -7,7 +9,7 @@ module Gitlab
       class DevEEQAImage
         attr_reader :base_url
 
-        DEV_ADDRESS = 'https://dev.gitlab.org'.freeze
+        DEV_ADDRESS = 'https://dev.gitlab.org'
         GITLAB_EE_QA_REPOSITORY_ID = 55
         QAImageNotFoundError = Class.new(StandardError)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http'
 require 'json'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Support

data/lib/gitlab/qa/test_logger.rb

@@ -61,7 +61,7 @@ module Gitlab
             logger.formatter = proc do |severity, datetime, progname, msg|
               msg_prefix = message_prefix(datetime, source, severity)
 
-              "#{msg_prefix}#{msg}\n"
+              "#{msg_prefix}#{msg}\n".gsub(/\e\[(\d+)(?:;\d+)*m/, "")
             end
           end
         end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.34.0'
+    VERSION = '8.0.0'
   end
 end