gitlab-qa 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748a1ab7cef2f22dba11a3989e6ff8216eab6bc06eb017b1ba52ee9fbfff031c
-  data.tar.gz: 3e95822a025fb825039e3615548eab3f5ba6046b340fdecf7fc5d65c8e16b912
+  metadata.gz: cbdcaeeeaa99ad4d6e7c479db9acaadc8f25e62f4fa17c4f6861d9b7be98fe2a
+  data.tar.gz: 890d74307cac468dae04a9108d80ca147a1c4f44fb14fc2301055d459f53cf06
 SHA512:
-  metadata.gz: b80fc3ecf1eb1934126ed816b73c7f73d55a9364fec8afe035bb7d36c34d99e25003f036dba237dea3e6888102948aa303e3d18d931ae92b72ef306b1538bee6
-  data.tar.gz: 7997a9183233fa52f52e7cf71b6a8a43577ae0631297244a2b9ac20d65a17ad4e7a300ea9af3361a67681be668e7b252e95d27ed1a458b8294ec4af56cea1800
+  metadata.gz: 903a50594c371873590470df3f8fc3fac516f29c086befd61c14bc2dbd17c87aa5e8a88d4792762fffa895e7b2caf8dd8670a37cde20fad527c7b75719759457
+  data.tar.gz: 59106ca07a8da61737bcaa482e0da8222fd6be52b5b0ee12f250be4cf0de0d55e99dbf6253ad712a049612e61f30253988690aba955648a7a0a3713d72468a23

data/.gitlab-ci.yml

@@ -739,6 +739,7 @@ ee:object_storage:
     - .rspec-report-opts
   variables:
     GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    QA_RSPEC_TAGS: "--tag object_storage"
 
 ee:object_storage-quarantine:
   extends:
@@ -749,6 +750,7 @@ ee:object_storage-quarantine:
     - .rspec-report-opts
   variables:
     GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
 ee:packages:
   extends:
@@ -758,6 +760,7 @@ ee:packages:
     - .rspec-report-opts
   variables:
     GITLAB_QA_OPTS: "--omnibus-config packages"
+    QA_RSPEC_TAGS: "--tag packages"
 
 ee:packages-quarantine:
   extends:
@@ -768,6 +771,7 @@ ee:packages-quarantine:
     - .rspec-report-opts
   variables:
     GITLAB_QA_OPTS: "--omnibus-config packages"
+    QA_RSPEC_TAGS: "--tag quarantine --tag packages"
 
 ce:actioncable:
   extends:

data/docs/what_tests_can_be_run.md

@@ -85,6 +85,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `DEPLOY_VERSION` |- | The version of GitLab being tested against. | No|
 | `GITLAB_QA_USER_AGENT` |- | The browser user-agent to use instead of the default Chrome user-agent. | No|
 | `GEO_FAILOVER` | `false` | Set to `true` when a Geo secondary site has been promoted to a Geo primary site. | No|
+| `GITLAB_INITIAL_ROOT_PASSWORD` | `5iveL!fe` | Initial root password for Omnibus installations | No|
 
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)

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

@@ -78,7 +78,7 @@ module Gitlab
         end
 
         def start # rubocop:disable Metrics/AbcSize
-          docker.run(image, tag) do |command|
+          docker.run(image: image, tag: tag) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"
@@ -129,7 +129,7 @@ module Gitlab
         def pull
           return if Runtime::Env.skip_pull?
 
-          docker.pull(image, tag)
+          docker.pull(image: image, tag: tag)
         end
 
         def process_exec_commands

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

@@ -13,7 +13,7 @@ module Gitlab
         end
 
         def start
-          @docker.run(image, tag) do |command|
+          @docker.run(image: image, tag: tag) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -33,7 +33,7 @@ module Gitlab
           @volumes[GITLAB_CERTIFICATES_PATH] = SSL_PATH
           @volumes[AUTHORITY_CERTIFICATES_PATH] = TRUSTED_PATH
 
-          @omnibus_configuration ||= OmnibusConfiguration.new
+          @omnibus_configuration ||= Runtime::OmnibusConfiguration.new(Runtime::Scenario.omnibus_configuration)
 
           self.release = 'CE'
         end
@@ -100,7 +100,7 @@ module Gitlab
         def start # rubocop:disable Metrics/AbcSize
           ensure_configured!
 
-          docker.run(image, tag) do |command|
+          docker.run(image: image, tag: tag) do |command|
             command << "-d -p #{port}"
             command << "--name #{name}"
             command << "--net #{network}"
@@ -206,20 +206,6 @@ module Gitlab
             @uri.scheme == 'https' ? { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE } : {}
           end
         end
-
-        class OmnibusConfiguration
-          def initialize
-            @config = Runtime::Scenario.attributes[:omnibus_configuration] || []
-          end
-
-          def <<(configuration)
-            @config << configuration
-          end
-
-          def to_s
-            @config.to_s
-          end
-        end
       end
     end
   end

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

@@ -49,7 +49,10 @@ module Gitlab
         def start
           raise "Must set gitlab_hostname" unless @gitlab_hostname
 
-          @docker.run(DOCKER_IMAGE, DOCKER_IMAGE_TAG, "-o StrictHostKeyChecking=no -N -R #{subdomain}:#{@gitlab_hostname}:80 #{ENV.fetch('TUNNEL_SSH_USER')}@#{tunnel_server_hostname}") do |command|
+          @docker.run(
+            image: DOCKER_IMAGE,
+            tag: DOCKER_IMAGE_TAG,
+            args: ["-o StrictHostKeyChecking=no -N -R #{subdomain}:#{@gitlab_hostname}:80 #{ENV.fetch('TUNNEL_SSH_USER')}@#{tunnel_server_hostname}"]) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -16,7 +16,7 @@ module Gitlab
         end
 
         def start
-          docker.run(image, tag) do |command|
+          docker.run(image: image, tag: tag) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -63,7 +63,7 @@ module Gitlab
         def start
           # copy-service needed for bootstraping LDAP user:
           # https://github.com/osixia/docker-openldap#seed-ldap-database-with-ldif
-          docker.run(image, tag, '--copy-service') do |command|
+          docker.run(image: image, tag: tag, args: ['--copy-service']) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -19,7 +19,7 @@ module Gitlab
         end
 
         def start
-          docker.run(image, tag) do |command|
+          docker.run(image: image, tag: tag) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -70,7 +70,7 @@ module Gitlab
         def start # rubocop:disable Metrics/AbcSize
           # --compat needed until https://gitlab.com/gitlab-org/gitlab-workhorse/issues/210
           # is resolved
-          docker.run(image, tag, "server", "--compat", DATA_DIR) do |command|
+          docker.run(image: image, tag: tag, args: ["server", "--compat", DATA_DIR]) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -10,7 +10,7 @@ module Gitlab
         end
 
         def start
-          @docker.run(image, tag) do |command|
+          @docker.run(image: image, tag: tag) do |command|
             command << "-d"
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -34,7 +34,7 @@ module Gitlab
 
         # rubocop:disable Metrics/AbcSize
         def start
-          docker.run(image, tag) do |command|
+          docker.run(image: image, tag: tag) do |command|
             command << '-d '
             command << "--name #{name}"
             command << "--net #{network}"

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

@@ -23,7 +23,7 @@ module Gitlab
 
           @docker.login(**release.login_params) if release.login_params
 
-          @docker.pull(qa_image) unless Runtime::Env.skip_pull?
+          @docker.pull(image: qa_image) unless Runtime::Env.skip_pull?
 
           puts "Running test suite `#{suite}` for #{release.project_name}"
 
@@ -43,7 +43,7 @@ module Gitlab
           feature_flag_sets << [] unless feature_flag_sets.any?
 
           feature_flag_sets.each do |feature_flag_set|
-            @docker.run(qa_image, nil, suite, *args_with_flags(args, feature_flag_set)) do |command|
+            @docker.run(image: qa_image, args: [suite, *args_with_flags(args, feature_flag_set)]) do |command|
               command << "-t --rm --net=#{network || 'bridge'}"
 
               env.merge(Runtime::Env.variables).each do |key, value|

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

@@ -15,11 +15,11 @@ module Gitlab
           Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
         end
 
-        def pull(image, tag = nil)
+        def pull(image:, tag: nil)
           Docker::Command.execute("pull #{full_image_name(image, tag)}")
         end
 
-        def run(image, tag, *args)
+        def run(image:, tag: nil, args: [])
           Docker::Command.new('run').tap do |command|
             yield command if block_given?
 

data/lib/gitlab/qa/runner.rb

@@ -57,7 +57,10 @@ module Gitlab
           end
         end
 
-        args.reject! { |arg| gitlab_qa_options.include?(arg) }
+        # Remove arguments passed into GitLab QA preventing them from being
+        # passed into the specs
+        args = remove_gitlab_qa_args(args)
+
         if args.size >= 1
           load_omnibus_configurations
 
@@ -79,7 +82,22 @@ module Gitlab
       end
 
       def self.gitlab_qa_options
-        @gitlab_qa_options ||= @options.top.list.map(&:long).flatten
+        @gitlab_qa_options ||= @options.top.list
+      end
+
+      # Take a set of arguments and remove them from the set of
+      # predefined GitLab QA arguments
+      # @param args Array the arguments to parse through and remove GitLab QA opts
+      # @return Arguments to be passed ultimately to the RSpec runner
+      def self.remove_gitlab_qa_args(args)
+        args.each_with_index do |arg, i|
+          gitlab_qa_options.each do |opt|
+            next unless opt.long.flatten.first == arg
+
+            args[i] = nil
+            args[i + 1] = nil if opt.is_a? OptionParser::Switch::RequiredArgument
+          end
+        end.compact
       end
 
       def self.load_omnibus_configurations
@@ -100,8 +118,8 @@ module Gitlab
           end
         rescue NameError
           raise <<~ERROR
-                Invalid Omnibus Configuration `#{config}`.
-                Possible configurations: #{Runtime::OmnibusConfigurations.constants.map { |c| c.to_s.underscore }.join(',')}"
+            Invalid Omnibus Configuration `#{config}`.
+            Possible configurations: #{Runtime::OmnibusConfigurations.constants.map { |c| c.to_s.underscore }.join(',')}"
           ERROR
         end
       end

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

@@ -90,7 +90,8 @@ module Gitlab
           'CACHE_NAMESPACE_NAME' => :cache_namespace_name,
           'DEPLOY_VERSION' => :deploy_version,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
-          'GEO_FAILOVER' => :geo_failover
+          'GEO_FAILOVER' => :geo_failover,
+          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -189,7 +190,7 @@ module Gitlab
         end
 
         def initial_root_password
-          ENV['GITLAB_INITIAL_ROOT_PASSWORD']
+          ENV['GITLAB_INITIAL_ROOT_PASSWORD'] || '5iveL!fe'
         end
 
         def qa_container_registry_access_token

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

@@ -6,8 +6,18 @@ module Gitlab
   module QA
     module Runtime
       class OmnibusConfiguration
-        def initialize
+        # @param prefixed_config The configuration to be prefixed to the new configuration
+        def initialize(prefixed_config = nil)
           @config = ["# Generated by GitLab QA Omnibus Configurator at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"]
+
+          return unless prefixed_config
+
+          # remove generation statement if it exists within the prefixed configuration that was passed
+          # and insert the rest AFTER the very first generation statement
+          config_to_insert = prefixed_config.to_s
+          generation_regexp = /# Generated by GitLab QA Omnibus Configurator.*\n/
+          config_to_insert = config_to_insert.gsub(generation_regexp, '') if config_to_insert.match?(generation_regexp)
+          @config.insert(1, config_to_insert)
         end
 
         def to_s
@@ -28,7 +38,7 @@ module Gitlab
           []
         end
 
-        # Ensures no duplicate entries
+        # Ensures no duplicate entries and sanitizes configurations
         # @raise RuntimeError if competing configurations exist
         # rubocop:disable Metrics/AbcSize
         def sanitize!

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

@@ -12,6 +12,7 @@ module Gitlab
               gitlab_rails['gitlab_default_theme'] = 10 # Light Red Theme
               gitlab_rails['gitlab_disable_animations'] = true # Disable animations
               gitlab_rails['application_settings_cache_seconds'] = 0 # Settings cache expiry
+              gitlab_rails['initial_root_password'] = '#{Runtime::Env.initial_root_password}' # Initial root password
             OMNIBUS
           end
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.0.1'.freeze
+    VERSION = '7.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control