gitlab-qa 7.34.0 → 7.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 917c47b2fbead3c77db3cd6c441995a8324ed73735262542dcd94de854022a35
-  data.tar.gz: 7785db11c9eb0f1f7ff2ecf32b16b8fd95ad9bab9391711f2d0af05a7e903153
+  metadata.gz: 68c6a21ac204323088f26d992fcff4a19a0a75af7f261a2d4b078a88aa0c5b92
+  data.tar.gz: 7f652f956d82d0523d9415d010330852846a6dd764e70b5156922cabc93cffe5
 SHA512:
-  metadata.gz: c509e252f4bd1e7d405d517920e306e2cdf5233cd73a5fbf25a878cbb863a7c21e5fedb007c8ef461f7e34e1899b27ff989d92182c427575a125f4c99a39de9d
-  data.tar.gz: 9011ddab65c7c0218ed49a5cbd2cdaa26f2b2ce013eb005d9ba63ee067ce18306bf8475861156ca52d7e2272cc9c94588ac86016e90e7901ecdac94d4e2f6cbf
+  metadata.gz: f59a52bfc23267353912547e351fc05a557f376326231ed98fa02f7799687276aab15ae99e773236673be64cb7a941bf6f73f0456bcea8cce25a667923291bb3
+  data.tar.gz: fa0037200819c8ed810551fcabf9566a1776e217773ca4e1410f1b9577dd80b6ebd98f578c6d29786b21883aec8dca73717d8b42bb9e77a5aa4ee73ed6a3409d

data/.gitlab/ci/jobs/registry_with_cdn.gitlab-ci.yml

@@ -1,4 +1,7 @@
 ce:registry_with_cdn:
+  before_script:
+    - unset GITLAB_QA_ADMIN_ACCESS_TOKEN
+    - !reference [default, before_script]
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -10,6 +13,9 @@ ce:registry_with_cdn:
   allow_failure: true
 
 ce:registry_with_cdn-quarantine:
+  before_script:
+    - unset GITLAB_QA_ADMIN_ACCESS_TOKEN
+    - !reference [default, before_script]
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -21,6 +27,9 @@ ce:registry_with_cdn-quarantine:
     QA_SCENARIO: "Test::Integration::RegistryWithCDN"
 
 ee:registry_with_cdn:
+  before_script:
+    - unset GITLAB_QA_ADMIN_ACCESS_TOKEN
+    - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -32,6 +41,9 @@ ee:registry_with_cdn:
   allow_failure: true
 
 ee:registry_with_cdn-quarantine:
+  before_script:
+    - unset GITLAB_QA_ADMIN_ACCESS_TOKEN
+    - !reference [default, before_script]
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test

data/.rubocop_todo.yml

@@ -95,13 +95,6 @@ Style/ExplicitBlockArgument:
   Exclude:
     - 'lib/gitlab/qa/scenario/test/integration/ldap.rb'
 
-# Offense count: 86
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/HashTransformKeys:

data/Dangerfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gitlab-dangerfiles'
 
 Gitlab::Dangerfiles.for_project(self) do |dangerfiles|

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (7.34.0)
+    gitlab-qa (7.35.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/exe/gitlab-qa

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

data/exe/gitlab-qa-report

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

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

@@ -155,7 +155,9 @@ module Gitlab
           rescue Docker::Shellout::StatusError => e
             # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
             if (retries += 1) < 3
-              puts "Retry instance_no_teardown due to Docker::Shellout::StatusError -- attempt #{retries}"
+              Runtime::Logger.warn(
+                "Retry instance_no_teardown due to Docker::Shellout::StatusError -- attempt #{retries}"
+              )
               teardown!
               retry
             end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class Elasticsearch < Base
-        DOCKER_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'.freeze
+        DOCKER_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch'
 
         def name
           @name ||= "elastic68"

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

@@ -13,6 +13,7 @@ module Gitlab
     module Component
       class Gitlab < Base
         extend Forwardable
+        using Rainbow
 
         attr_reader :release, :omnibus_configuration, :omnibus_gitlab_rails_env
         attr_accessor :tls, :skip_availability_check, :runner_network, :seed_admin_token, :seed_db
@@ -121,8 +122,9 @@ module Gitlab
         def prepare_gitlab_omnibus_config
           set_formless_login_token
           set_license_mode
+          return if omnibus_gitlab_rails_env.empty?
 
-          @omnibus_configuration << "gitlab_rails['env'] = #{@omnibus_gitlab_rails_env}" unless omnibus_gitlab_rails_env.empty?
+          @omnibus_configuration << "gitlab_rails['env'] = #{@omnibus_gitlab_rails_env}"
         end
 
         def start # rubocop:disable Metrics/AbcSize
@@ -148,7 +150,12 @@ module Gitlab
               command << "--network-alias #{network_alias}"
             end
           end
-          Docker::Command.execute("network connect --alias #{name}.#{network} --alias #{name}.#{runner_network} #{runner_network} #{name}") if runner_network
+
+          return unless runner_network
+
+          Docker::Command.execute(
+            "network connect --alias #{name}.#{network} --alias #{name}.#{runner_network} #{runner_network} #{name}"
+          )
         end
 
         def reconfigure
@@ -163,10 +170,19 @@ module Gitlab
         def wait_until_ready
           return if skip_availability_check
 
-          if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(Runtime::Env.gitlab_availability_timeout)
-            puts ' -> GitLab is available.'
+          availability = Availability.new(
+            name,
+            relative_path: relative_path,
+            scheme: scheme,
+            protocol_port: port.to_i
+          )
+
+          Runtime::Logger.info("Waiting for GitLab to become healthy ...")
+
+          if availability.check(Runtime::Env.gitlab_availability_timeout)
+            Runtime::Logger.info("-> GitLab is available at `#{availability.uri}`!".bright)
           else
-            abort ' -> GitLab unavailable!'
+            abort '-> GitLab unavailable!'.red
           end
         end
 
@@ -260,7 +276,10 @@ module Gitlab
           [
             @docker.exec(name, 'mkdir -p /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d'),
             @docker.write_files(name) do |f|
-              f.write('/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/pre-receive.d', global_server_prereceive_hook, false)
+              f.write(
+                '/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/pre-receive.d',
+                global_server_prereceive_hook, false
+              )
             end,
             @docker.exec(name, 'chmod +x /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/*')
           ]
@@ -270,42 +289,41 @@ module Gitlab
           def initialize(name, relative_path: '', scheme: 'http', protocol_port: 80)
             @docker = Docker::Engine.new
 
-            host = @docker.hostname
-            port = @docker.port(name, protocol_port).split(':').last
-
-            @uri = URI.join("#{scheme}://#{host}:#{port}", "#{relative_path}/", 'help')
+            @name = name
+            @scheme = scheme
+            @relative_path = relative_path
+            @protocol_port = protocol_port
           end
 
           def check(retries)
-            print "Waiting for GitLab at `#{@uri}` to become available "
-
             retries.times do
               return true if service_available?
 
-              print '.'
               sleep 1
             end
 
             false
           end
 
+          def uri
+            @uri ||= begin
+              port = docker.port(name, protocol_port).split(':').last
+
+              URI.join("#{scheme}://#{docker.hostname}:#{port}", relative_path)
+            end
+          end
+
           private
 
+          attr_reader :docker, :name, :relative_path, :scheme, :protocol_port
+
           def service_available?
-            response = Net::HTTP.start(@uri.host, @uri.port, opts) do |http|
-              http.head2(@uri.request_uri)
-            end
+            output = docker.inspect(name) { |command| command << "--format='{{json .State.Health.Status}}'" }
 
-            print response.code
-            response.code.to_i == 200
-          rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError => e
-            print e.message
+            output == '"healthy"'
+          rescue Docker::Shellout::StatusError
             false
           end
-
-          def opts
-            @uri.scheme == 'https' ? { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE } : {}
-          end
         end
       end
     end

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 
 module Gitlab
   module QA
     module Component
       class InternetTunnel < Base
-        DOCKER_IMAGE = 'gitlab/ssh-tunnel'.freeze
-        DOCKER_IMAGE_TAG = '1.0.0'.freeze
+        DOCKER_IMAGE = 'gitlab/ssh-tunnel'
+        DOCKER_IMAGE_TAG = '1.0.0'
 
         attr_writer :gitlab_hostname
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class Jira < Base
-        DOCKER_IMAGE = 'registry.gitlab.com/gitlab-org/gitlab-qa/jira-gitlab'.freeze
-        DOCKER_IMAGE_TAG = '8.8-project-and-issue'.freeze
+        DOCKER_IMAGE = 'registry.gitlab.com/gitlab-org/gitlab-qa/jira-gitlab'
+        DOCKER_IMAGE_TAG = '8.8-project-and-issue'
 
         def name
           @name ||= "jira"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This component sets up the MailHog (https://github.com/mailhog/MailHog)
 # image with the proper configuration for SMTP email delivery from Gitlab
 
@@ -5,8 +6,8 @@ module Gitlab
   module QA
     module Component
       class MailHog < Base
-        DOCKER_IMAGE = 'mailhog/mailhog'.freeze
-        DOCKER_IMAGE_TAG = 'v1.0.0'.freeze
+        DOCKER_IMAGE = 'mailhog/mailhog'
+        DOCKER_IMAGE_TAG = 'v1.0.0'
 
         def name
           @name ||= "mailhog"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 require 'fileutils'
 require 'yaml'
@@ -8,12 +10,12 @@ module Gitlab
   module QA
     module Component
       class Minio < Base
-        DOCKER_IMAGE = 'minio/minio'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+        DOCKER_IMAGE = 'minio/minio'
+        DOCKER_IMAGE_TAG = 'latest'
         # These are secrets used in a local Minio container, they're not used for any online S3 server.
-        AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'.freeze
-        AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'.freeze
-        DATA_DIR = '/data'.freeze
+        AWS_ACCESS_KEY = 'AKIAIOSFODNN7EXAMPLE'
+        AWS_SECRET_KEY = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
+        DATA_DIR = '/data'
         DEFAULT_PORT = 9000
 
         def initialize

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class PostgreSQL < Base
-        DOCKER_IMAGE = 'postgres'.freeze
-        DOCKER_IMAGE_TAG = '11'.freeze
+        DOCKER_IMAGE = 'postgres'
+        DOCKER_IMAGE_TAG = '11'
 
         def name
           @name ||= "postgres"

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class Preprod < Staging
-        ADDRESS = 'https://pre.gitlab.com'.freeze
+        ADDRESS = 'https://pre.gitlab.com'
       end
     end
   end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class Production < Staging
-        ADDRESS = 'https://gitlab.com'.freeze
+        ADDRESS = 'https://gitlab.com'
       end
     end
   end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class Release < Staging
-        ADDRESS = 'https://release.gitlab.net'.freeze
+        ADDRESS = 'https://release.gitlab.net'
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 # This component sets up the docker-test-saml-idp (https://github.com/kristophjunge/docker-test-saml-idp)
@@ -7,8 +9,8 @@ module Gitlab
   module QA
     module Component
       class SAML < Base
-        DOCKER_IMAGE = 'jamedjo/test-saml-idp'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+        DOCKER_IMAGE = 'jamedjo/test-saml-idp'
+        DOCKER_IMAGE_TAG = 'latest'
 
         def set_entity_id(entity_id)
           @environment['SIMPLESAMLPHP_SP_ENTITY_ID'] = entity_id

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'json'
 require 'uri'
@@ -6,8 +8,8 @@ module Gitlab
   module QA
     module Component
       class Staging
-        ADDRESS = 'https://staging.gitlab.com'.freeze
-        GEO_SECONDARY_ADDRESS = 'https://geo.staging.gitlab.com'.freeze
+        ADDRESS = 'https://staging.gitlab.com'
+        GEO_SECONDARY_ADDRESS = 'https://geo.staging.gitlab.com'
 
         def self.release
           QA::Release.new(image)

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Component
       class StagingRef < Staging
-        ADDRESS = 'https://staging-ref.gitlab.com'.freeze
-        GEO_SECONDARY_ADDRESS = 'https://geo.staging-ref.gitlab.com'.freeze
+        ADDRESS = 'https://staging-ref.gitlab.com'
+        GEO_SECONDARY_ADDRESS = 'https://geo.staging-ref.gitlab.com'
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Docker
@@ -43,7 +45,7 @@ module Gitlab
         #
         # @return [String] The masked command string
         def mask_secrets
-          @mask_secrets.each_with_object(to_s) { |secret, s| s.gsub!(secret, '*****') }
+          @mask_secrets.each_with_object(+to_s) { |secret, s| s.gsub!(secret, '*****') }
         end
 
         def ==(other)
@@ -52,6 +54,10 @@ module Gitlab
 
         def execute!(&block)
           Docker::Shellout.new(self).execute!(&block)
+        rescue Docker::Shellout::StatusError => e
+          e.set_backtrace([])
+
+          raise e
         end
 
         def self.execute(cmd, mask_secrets: nil, &block)

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

@@ -142,6 +142,16 @@ module Gitlab
           Docker::Command.execute(['ps', name].compact.join(' '))
         end
 
+        def inspect(name)
+          Docker::Command.new('inspect').then do |command|
+            yield command if block_given?
+
+            command << name
+
+            command.execute!
+          end
+        end
+
         private
 
         def full_image_name(image, tag)

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') || '7.17.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/version.rb

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

data/lib/gitlab/qa.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'rainbow/refinement'
+
 module Gitlab
   module QA
     autoload :Release, 'gitlab/qa/release'

data/scripts/generate-qa-jobs.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'yaml'
 

data/support/data/license_usage_seed.rb

@@ -48,7 +48,8 @@ class LicenseUsageSeed
   end
 
   def self.create_member(user, group_id)
-    roles = Gitlab::Access.values
+    # Excludes GUEST role based on ultimate license seat count
+    roles = [Gitlab::Access::REPORTER, Gitlab::Access::DEVELOPER, Gitlab::Access::MAINTAINER]
 
     GroupMember.create(user_id: user.id, access_level: roles.sample, source_id: group_id)
     Users::UpdateHighestMemberRoleService.new(user).execute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.34.0
+  version: 7.35.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control