gitlab-qa 11.3.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c544ee8f1f83271ae1d95a95b85d48bdc8d1abda530e8c63925c151972a38d
-  data.tar.gz: 8f99edf998bf8bb342f5083f1f9bfbcd69ba64143cacf509553e0380e24acc7b
+  metadata.gz: 44c3f1975df510d4b2f4405391b5dc55fdbca1015e648733c9f51ed7a824579c
+  data.tar.gz: 79b8b01d8ec055ef029993a0c9a02730b99880f8292b5d4d00bba1d6cc68f073
 SHA512:
-  metadata.gz: 2c3ba16fb6771ba6302e074ec9d89b3b884ddaccff171f205453d82fb5aa1fb4a9b7356397f23847f9579e0c8f1e1031fc1dded51a99d86dec13595989b7d802
-  data.tar.gz: 998a6798f90d4b9c7ed7836d2ef82409b8fcd622dc92f23a914781e8eb21f428c8ad658b7111d8403a5d1718a176c750e71a69087c0c99cf558f52724b007570
+  metadata.gz: ed8cc183055d3381e0b356805680a6317df4a07a67f697fd9f8f8c3d558391602653d14b18ed648c681bbdada0dcd8b5a23d113da0115becf7b152279f407e82
+  data.tar.gz: 20b95e74a751ff88f871511cbf8fe30332fac52f6f80fdf59c03201bbb2bca0f50a65bed640a01f61e0cb8d8395c15359fa55906a3b6ede2a863417e17b1e810

data/.gitignore

@@ -6,11 +6,11 @@
 /pkg/
 /spec/reports/
 /.idea
+/vendor/bundle
 .ruby-version
 .ruby-gemset
 .DS_Store
 .rakeTasks
 .tool-versions
-
 # ignore built gems
 *.gem

data/.gitlab-ci.yml

@@ -20,7 +20,7 @@ stages:
   - deploy
 
 default:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
+  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3
   tags:
     - gitlab-org
   cache:
@@ -41,6 +41,7 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
 variables:
+  DEBIAN_VERSION: bullseye
   RUBY_VERSION: "3.0"
   BUNDLE_PATH: vendor
   BUNDLE_SILENCE_ROOT_WARNING: "true"
@@ -133,6 +134,7 @@ package-and-test:
   inherit:
     variables:
       - RUBY_VERSION
+      - DEBIAN_VERSION
   when: manual
   trigger:
     strategy: depend

data/.rubocop.yml

@@ -7,6 +7,11 @@ inherit_from:
   - '.rubocop_todo.yml'
   <% end %>
 
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  TargetRubyVersion: 3.0
+
 Lint/HashCompareByIdentity:
   Enabled: true
 
@@ -41,5 +46,11 @@ RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
 CodeReuse/ActiveRecord:
-  Exclude:
-    - 'spec/**/*_spec.rb'
+  Enabled: false
+
+Style/OperatorMethodCall:
+  Enabled: false
+
+# disable for now as it might break automatic publish
+Gemspec/RequireMFA:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,123 +1,95 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2022-06-21 18:16:41 UTC using RuboCop version 0.93.1.
+# `rubocop --auto-gen-config --no-exclude-limit`
+# on 2023-06-14 08:01:25 UTC using RuboCop version 1.43.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 199
-# Cop supports --auto-correct.
-CodeReuse/ActiveRecord:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Cop/LineBreakAroundConditionalBlock:
-  Exclude:
-    - 'lib/gitlab/qa/release.rb'
-
 # Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
+Cop/AvoidReturnFromBlocks:
   Exclude:
-    - 'gitlab-qa.gemspec'
+    - 'lib/gitlab/qa/scenario/template.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
 # Offense count: 5
-Lint/MixedRegexpCaptureTypes:
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
   Exclude:
-    - 'lib/gitlab/qa/release.rb'
+    - 'spec/gitlab/qa/component/gitlab_spec.rb'
+    - 'spec/gitlab/qa/docker/engine_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/RedundantCopDisableDirective:
+# Offense count: 3
+Lint/MixedRegexpCaptureTypes:
   Exclude:
-    - 'lib/gitlab/qa/component/staging.rb'
-    - 'lib/gitlab/qa/runtime/scenario.rb'
+    - 'lib/gitlab/qa/release.rb'
 
-# Offense count: 21
-# Configuration parameters: IgnoredMethods.
+# Offense count: 22
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 60
-  IgnoredMethods:
-    - perform
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
   Exclude:
-    - 'lib/gitlab/qa/component/staging.rb'
+    - 'lib/gitlab/qa/scenario/test/instance/airgapped.rb'
+    - 'lib/gitlab/qa/scenario/test/instance/image.rb'
+    - 'lib/gitlab/qa/scenario/test/instance/relative_url.rb'
+    - 'lib/gitlab/qa/scenario/test/instance/repository_storage.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/client_ssl.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/elasticsearch.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/geo.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/gitlab_pages.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/integrations.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/jira.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/mattermost.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/metrics.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/mtls.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/oauth.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/opensearch.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/registry.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/registry_tls.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/registry_with_cdn.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/smtp.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb'
+    - 'lib/gitlab/qa/scenario/test/sanity/version.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: CustomTransform, IgnoredWords.
-RSpec/ExampleWording:
+# Offense count: 2
+# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms.
+Naming/InclusiveLanguage:
   Exclude:
-    - 'spec/gitlab/qa/component/gitlab_spec.rb'
+    - 'lib/gitlab/qa/scenario/test/integration/geo.rb'
 
 # Offense count: 2
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ExplicitBlockArgument:
+# Offense count: 33
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
   Exclude:
-    - 'lib/gitlab/qa/scenario/test/integration/ldap.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/HashTransformKeys:
-  Exclude:
-    - 'lib/gitlab/qa/docker/volumes.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/HashTransformation:
-  Exclude:
-    - 'lib/gitlab/qa/docker/volumes.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/gitlab/qa/runtime/env.rb'
-    - 'lib/gitlab/qa/runtime/scenario.rb'
-    - 'lib/gitlab/qa/scenario/test/omnibus/upgrade.rb'
+    - 'spec/gitlab/qa/component/gitaly_cluster_spec.rb'
+    - 'spec/gitlab/qa/component/gitaly_spec.rb'
+    - 'spec/gitlab/qa/component/gitlab_spec.rb'
+    - 'spec/gitlab/qa/component/praefect_spec.rb'
+    - 'spec/gitlab/qa/component/selenoid_spec.rb'
+    - 'spec/gitlab/qa/component/specs_spec.rb'
+    - 'spec/gitlab/qa/docker/command_spec.rb'
+    - 'spec/gitlab/qa/docker/engine_spec.rb'
+    - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/gitlab/qa/runtime/scenario.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'db/migrate/**/*'
-    - 'db/post_migrate/**/*'
-    - 'db/geo/migrate/**/*'
-    - 'lib/gitlab/qa/release.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'lib/gitlab/qa/release.rb'
-
-# Offense count: 191
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 24
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 189
+  Max: 172

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (11.3.0)
-      activesupport (~> 6.1)
+    gitlab-qa (12.0.0)
+      activesupport (>= 6.1, < 7.1)
       gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)
@@ -14,12 +14,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (7.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
@@ -97,12 +96,12 @@ GEM
     gitlab-dangerfiles (2.11.0)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
-    gitlab-styles (6.2.1)
-      rubocop (~> 0.91, >= 0.91.1)
-      rubocop-gitlab-security (~> 0.1.1)
-      rubocop-performance (~> 1.9.2)
-      rubocop-rails (~> 2.9)
-      rubocop-rspec (~> 1.44)
+    gitlab-styles (10.0.0)
+      rubocop (~> 1.43.0)
+      rubocop-graphql (~> 0.18)
+      rubocop-performance (~> 1.15)
+      rubocop-rails (~> 2.17)
+      rubocop-rspec (~> 2.18)
     hashdiff (1.0.1)
     http (5.1.1)
       addressable (~> 2.8)
@@ -118,6 +117,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
+    json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -144,16 +144,17 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
     racc (1.6.0)
-    rack (3.0.1)
+    rack (3.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
+    rbs (2.8.4)
     rchardet (1.8.0)
     regexp_parser (2.6.1)
     reverse_markdown (2.1.1)
@@ -172,29 +173,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (0.93.1)
+    rubocop (1.43.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-gitlab-security (0.1.1)
-      rubocop (>= 0.51)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-graphql (0.19.0)
+      rubocop (>= 0.87, < 2)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
@@ -209,18 +216,19 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.47.2)
+    solargraph (0.49.0)
       backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
       diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
@@ -235,7 +243,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     webmock (3.7.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -252,7 +260,7 @@ DEPENDENCIES
   climate_control (~> 1.0.1)
   gitlab-dangerfiles (~> 2.11)
   gitlab-qa!
-  gitlab-styles (~> 6.2.1)
+  gitlab-styles (~> 10)
   lefthook (~> 1.2.6)
   pry (~> 0.11)
   rake (~> 13.0)
@@ -264,4 +272,4 @@ DEPENDENCIES
   webmock (= 3.7.0)
 
 BUNDLED WITH
-   2.4.2
+   2.4.5

data/gitlab-qa.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['GitLab Quality']
   spec.email         = ['gitlab-qa@gmail.com']
 
+  spec.required_ruby_version = ">= 3.0.0"
+
   spec.summary       = 'Integration tests for GitLab'
   spec.homepage      = 'http://about.gitlab.com/'
   spec.license       = 'MIT'
@@ -22,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'climate_control', '~> 1.0.1'
   spec.add_development_dependency 'gitlab-dangerfiles', '~> 2.11'
-  spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
+  spec.add_development_dependency 'gitlab-styles', '~> 10'
   spec.add_development_dependency 'lefthook', '~> 1.2.6'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 13.0'
@@ -33,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'timecop', '~> 0.9.5'
   spec.add_development_dependency 'webmock', '3.7.0'
 
-  spec.add_runtime_dependency 'activesupport', '~> 6.1'
+  spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.1'
   spec.add_runtime_dependency 'gitlab', '~> 4.19'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'

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

@@ -11,13 +11,13 @@ module Gitlab
         attr_reader :docker
         attr_writer :name, :exec_commands
         attr_accessor :volumes,
-                      :ports,
-                      :network,
-                      :network_aliases,
-                      :environment,
-                      :runner_network,
-                      :airgapped_network,
-                      :additional_hosts
+          :ports,
+          :network,
+          :network_aliases,
+          :environment,
+          :runner_network,
+          :airgapped_network,
+          :additional_hosts
 
         def initialize
           @docker = Docker::Engine.new
@@ -42,13 +42,13 @@ module Gitlab
         end
 
         def image
-          return self.class.const_get('DOCKER_IMAGE') if self.class.const_defined?('DOCKER_IMAGE')
+          return self.class.const_get(:DOCKER_IMAGE) if self.class.const_defined?(:DOCKER_IMAGE)
 
           raise NotImplementedError, "#{self.class.name} must specify a docker image as DOCKER_IMAGE"
         end
 
         def tag
-          return self.class.const_get('DOCKER_IMAGE_TAG') if self.class.const_defined?('DOCKER_IMAGE_TAG')
+          return self.class.const_get(:DOCKER_IMAGE_TAG) if self.class.const_defined?(:DOCKER_IMAGE_TAG)
 
           raise NotImplementedError, "#{self.class.name} must specify a docker image tag as DOCKER_IMAGE_TAG"
         end

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

@@ -36,9 +36,9 @@ module Gitlab
 
         def reconfigure
           setup_omnibus
-          @docker.attach(name) do |line, wait|
+          @docker.attach(name) do |line, _wait|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 

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

@@ -6,11 +6,11 @@ module Gitlab
       class GitalyCluster
         class GitalyClusterConfig
           attr_accessor :gitlab_name, :network, :airgapped_network,
-                        :praefect_node_name, :praefect_port, :praefect_ip,
-                        :primary_node_name, :primary_node_port,
-                        :secondary_node_name, :secondary_node_port,
-                        :tertiary_node_name, :tertiary_node_port,
-                        :database_node_name, :database_port
+            :praefect_node_name, :praefect_port, :praefect_ip,
+            :primary_node_name, :primary_node_port,
+            :secondary_node_name, :secondary_node_port,
+            :tertiary_node_name, :tertiary_node_port,
+            :database_node_name, :database_port
 
           attr_reader :praefect_addr, :primary_node_addr, :secondary_node_addr, :tertiary_node_addr, :database_node_addr
 
@@ -79,9 +79,15 @@ module Gitlab
 
           if parallel_gitaly
             threads = []
-            threads << Thread.new { @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release) }
-            threads << Thread.new { @gitaly_secondary_node = gitaly(config.secondary_node_name, config.secondary_node_port, release) }
-            threads << Thread.new { @gitaly_tertiary_node = gitaly(config.tertiary_node_name, config.tertiary_node_port, release) }
+            threads << Thread.new do
+              @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release)
+            end
+            threads << Thread.new do
+              @gitaly_secondary_node = gitaly(config.secondary_node_name, config.secondary_node_port, release)
+            end
+            threads << Thread.new do
+              @gitaly_tertiary_node = gitaly(config.tertiary_node_name, config.tertiary_node_port, release)
+            end
             threads.each(&:join)
           else
             @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
@@ -17,19 +18,19 @@ module Gitlab
         using Rainbow
 
         attr_reader :release,
-                    :omnibus_configuration,
-                    :omnibus_gitlab_rails_env,
-                    :authority_volume,
-                    :ssl_volume
+          :omnibus_configuration,
+          :omnibus_gitlab_rails_env,
+          :authority_volume,
+          :ssl_volume
 
         attr_accessor :tls,
-                      :skip_availability_check,
-                      :runner_network,
-                      :seed_admin_token,
-                      :seed_db,
-                      :skip_server_hooks,
-                      :gitaly_tls,
-                      :secrets
+          :skip_availability_check,
+          :runner_network,
+          :seed_admin_token,
+          :seed_db,
+          :skip_server_hooks,
+          :gitaly_tls,
+          :secrets
 
         attr_writer :name, :relative_path
 
@@ -182,9 +183,9 @@ module Gitlab
         def reconfigure
           setup_omnibus
 
-          @docker.attach(name) do |line, wait|
+          @docker.attach(name) do |line, _wait|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -252,7 +253,7 @@ module Gitlab
         end
 
         def delete_key_file(path)
-          File.delete(path) if File.exist?(path)
+          FileUtils.rm_f(path)
         end
 
         private

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

@@ -1,4 +1,5 @@
 # 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
 

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

@@ -37,7 +37,7 @@ module Gitlab
           setup_omnibus
           @docker.attach(name) do |line|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -50,7 +50,7 @@ module Gitlab
         def wait_until_ready
           @docker.exec(name, 'praefect -config /var/opt/gitlab/praefect/cluster_config.toml check || true') do |resp|
             Runtime::Logger.info(resp)
-            break if /All checks passed/.match?(line)
+            break if line.include?('All checks passed')
           end
         end
 

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

@@ -29,10 +29,12 @@ module Gitlab
           pull_images
           docker.run(image: image, tag: tag, args:
                       ['-video-recorder-image',
-                       QA::Runtime::Env.video_recorder_image,
-                       '-container-network',
-                       network]
-                    ) do |command|
+                        QA::Runtime::Env.video_recorder_image,
+                        '-container-network',
+                        network,
+                        '-timeout',
+                        '10m0s']
+          ) do |command|
             set_command_args(command)
             set_volumes(command)
           end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/AbcSize
 
@@ -56,8 +57,10 @@ module Gitlab
 
           feature_flag_sets = []
 
-          # When `args` includes `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
-          # `feature_flag_sets` will be set to `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
+          # When `args` includes:
+          #   `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
+          # `feature_flag_sets` will be set to:
+          #   `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
           # This will result in tests running three times, once with each feature flag option.
           while (index = args&.index { |x| x =~ /--.*-feature/ })
             feature_flag_sets << args.slice!(index, 2)