gitlab-qa 7.8.4 → 7.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8e6f385001950cb2511426d82a6acac3c3615683b8dbd48214df976c6fb07d5
-  data.tar.gz: 51de85c6c9c5dca24ba24961d45005d9ff2bbe168d7a8819f54ee6412ab0abcd
+  metadata.gz: 92a2005951e787030d65328cb79b2648d3f924e160c4d9ce29a74620b6605f6f
+  data.tar.gz: 1684b8e6c59f4b4a0c745212492d201439c5ba592284a6661dad2335ae1db242
 SHA512:
-  metadata.gz: e4ee08298871f1dff0ce9e0c007ac1c7e6d643fd13161f38beac5a59574a43931abf87a904488ba1b9e6037d451b22ad151b10afed9df41ed68bf39b1500e18e
-  data.tar.gz: 266d10c931d8762dcfb34e9aa07f44a38dd1656cccbdd38a7e559ce04d8fec2144f5156f8b8cc4a372db9420a064940861e17146e78d77c0966cbd497e5a4001
+  metadata.gz: e00789509550eb418e7f1d3a274ece9ee372a20c147af0cacd6eb25c0e6b2c9ba46124a3fe63b5957d5fa6b18d3ef115576f0057caa5ce0f26513f73cf34a632
+  data.tar.gz: ef94d1f6ec4e1f7fde22aaf8da43992d9e3f4bec7d508f80f534429196cf5816e7a61678ea849d1d39b3ca74d07b610c131c66f2e096dde098d8fe7c0df137a0

data/.gitlab-ci.yml

@@ -55,7 +55,7 @@ variables:
 .check-base:
   stage: check
   script:
-    - bundle exec $CI_JOB_NAME
+    - bundle exec $CI_JOB_NAME --color
 
 rubocop:
   extends: .check-base
@@ -78,8 +78,31 @@ rspec:
     reports:
       junit: gitlab-qa-run-*/**/rspec-*.xml
   script:
-    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
-    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
+    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
+    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
+    - bundle exec exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
+    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
+    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
+    - exit $test_run_exit_code
+
+# For jobs that shouldn't report results in issues, e.g., manually run custom jobs
+.no-issue-report-script:
+  script:
+    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
+    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
+
+# For jobs that provide additional GITLAB_QA_OPTIONS, e.g., jobs that include --omnibus-config
+.combined-gitlab-qa-options-script:
+  script:
+    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
+    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS_COMBINED -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
+
+# The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter
+# So instead we can use this script with two release variables
+.update-scenario-script:
+  script:
+    - 'echo "Running: bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=$DEFAULT_RELEASE} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
+    - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=$DEFAULT_RELEASE} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTIONS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS || test_run_exit_code=$?
     - bundle exec exe/gitlab-qa-report --update-screenshot-path "gitlab-qa-run-*/**/rspec-*.xml"
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
     - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
@@ -177,28 +200,23 @@ ee:sanity-framework:
     - .high-capacity
     - .ee-qa
 
-# The custom jobs are for manually running specific/alternative tests in MRs, so we don't report them in issues
 ce:custom-parallel:
-  script:
-    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
-    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
+    - .no-issue-report-script
   allow_failure: true
   parallel: 10
 
 ee:custom-parallel:
-  script:
-    - 'echo "Running: bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"'
-    - bundle exec exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS
   extends:
     - .test
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
+    - .no-issue-report-script
   allow_failure: true
   parallel: 10
 
@@ -337,61 +355,46 @@ ee:image:
     - .test
     - .ee-qa
 
-# The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter
-# So instead we include the script here again, with two release variables
 ce:update:
-  script:
-    - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$?
-    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
-    - exit $test_run_exit_code
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
     - .knapsack-variables
+    - .update-scenario-script
   parallel: 5
 
 ce:update-quarantine:
-  script:
-    - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$?
-    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
-    - exit $test_run_exit_code
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .quarantine
     - .rspec-report-opts
+    - .update-scenario-script
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
 ee:update:
-  script:
-    - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$?
-    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
-    - exit $test_run_exit_code
   extends:
     - .test
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
     - .knapsack-variables
+    - .update-scenario-script
   parallel: 10
 
 ee:update-quarantine:
-  script:
-    - bundle exec exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$?
-    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
-    - exit $test_run_exit_code
   extends:
     - .test
     - .high-capacity
     - .ee-qa
     - .quarantine
     - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
 # The Test::Omnibus::Upgrade scenario isn't run on master (because it always uses the latest CE/EE image) so we don't report the test results in issues
 ce:upgrade:
@@ -648,8 +651,9 @@ ce:object_storage:
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage"
 
 ce:object_storage-quarantine:
   extends:
@@ -658,8 +662,9 @@ ce:object_storage-quarantine:
     - .ce-qa
     - .quarantine
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage"
 
 ee:object_storage_aws:
   extends:
@@ -667,11 +672,34 @@ ee:object_storage_aws:
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage_aws"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage_aws"
     QA_RSPEC_TAGS: "--tag object_storage"
 
 ee:object_storage_aws-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
+  variables:
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage_aws"
+    QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
+
+ee:object_storage_gcs:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_gcs"
+    QA_RSPEC_TAGS: "--tag object_storage"
+
+ee:object_storage_gcs-quarantine:
   extends:
     - .test
     - .high-capacity
@@ -679,7 +707,7 @@ ee:object_storage_aws-quarantine:
     - .quarantine
     - .rspec-report-opts
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage_aws"
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_gcs"
     QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
 ee:object_storage:
@@ -688,8 +716,9 @@ ee:object_storage:
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage"
     QA_RSPEC_TAGS: "--tag object_storage"
 
 ee:object_storage-quarantine:
@@ -699,8 +728,9 @@ ee:object_storage-quarantine:
     - .ee-qa
     - .quarantine
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config object_storage"
     QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
 ee:packages:
@@ -709,8 +739,9 @@ ee:packages:
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config packages"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config packages"
     QA_RSPEC_TAGS: "--tag packages"
 
 ee:packages-quarantine:
@@ -720,8 +751,9 @@ ee:packages-quarantine:
     - .ee-qa
     - .quarantine
     - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
   variables:
-    GITLAB_QA_OPTS: "--omnibus-config packages"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config packages"
     QA_RSPEC_TAGS: "--tag quarantine --tag packages"
 
 ce:registry:
@@ -852,7 +884,7 @@ ee:praefect:
     - .ee-qa
     - .knapsack-variables
     - .rspec-report-opts
-  parallel: 5
+  parallel: 10
   variables:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"

data/.rubocop.yml

@@ -1,15 +1,21 @@
-inherit_from: .rubocop_todo.yml
-
-require:
-  # Due to a probably bug in rubocop (https://github.com/bbatsov/rubocop/issues/5251)
-  # we need to require rubocop-rspec a second time so that RSpec/FilePath does
-  # not fallback to Rails/FilePath.
-  - rubocop-rspec
-
 inherit_gem:
   gitlab-styles:
     - rubocop-default.yml
 
+inherit_from:
+  <% unless ENV['REVEAL_RUBOCOP_TODO'] == '1' %>
+  - '.rubocop_todo.yml'
+  <% end %>
+
+Lint/HashCompareByIdentity:
+  Enabled: true
+
+Lint/RedundantSafeNavigation:
+  Enabled: true
+
+Style/ClassEqualityComparison:
+  Enabled: true
+
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,17 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-10-31 07:26:03 -0700 using RuboCop version 0.82.0.
+# on 2021-09-17 06:55:33 UTC using RuboCop version 0.93.1.
 # 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: 51
+# Offense count: 165
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 210
+CodeReuse/ActiveRecord:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Cop/LineBreakAroundConditionalBlock:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/runtime/env.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'gitlab-qa.gemspec'
+
+# Offense count: 1
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
+
+# Offense count: 5
+Lint/MixedRegexpCaptureTypes:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
+    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -20,6 +44,13 @@ Lint/RedundantCopDisableDirective:
     - 'lib/gitlab/qa/component/staging.rb'
     - 'lib/gitlab/qa/runtime/scenario.rb'
 
+# Offense count: 10
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 26
+  IgnoredMethods:
+    - perform
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
@@ -33,6 +64,13 @@ Performance/RegexpMatch:
   Exclude:
     - 'lib/gitlab/qa/component/gitlab.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/StringInclude:
+  Exclude:
+    - 'lib/gitlab/qa/component/gitlab.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 RSpec/EmptyLineAfterLetBlock:
@@ -51,7 +89,18 @@ RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
-# Offense count: 93
+# Offense count: 221
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 22
+
+# Offense count: 1
+# Cop supports --auto-correct.
+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
@@ -64,21 +113,19 @@ Style/HashTransformKeys:
   Exclude:
     - 'lib/gitlab/qa/docker/volumes.rb'
 
-# Offense count: 6
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/HashTransformation:
+  Exclude:
+    - 'lib/gitlab/qa/docker/volumes.rb'
+
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
-    - 'lib/gitlab/qa/component/gitlab.rb'
-    - 'lib/gitlab/qa/release.rb'
     - 'lib/gitlab/qa/runtime/env.rb'
     - 'lib/gitlab/qa/runtime/scenario.rb'
     - 'lib/gitlab/qa/scenario/test/omnibus/upgrade.rb'
-    - 'lib/gitlab/qa/support/http_request.rb'
-
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/gitlab/qa/runtime/scenario.rb'
 
 # Offense count: 1
 Style/MissingRespondToMissing:
@@ -96,3 +143,25 @@ Style/MutableConstant:
     - 'db/geo/migrate/**/*'
     - 'lib/gitlab/qa/release.rb'
     - 'lib/gitlab/qa/report/update_screenshot_path.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/gitlab/qa/release.rb'
+    - 'lib/gitlab/qa/report/generate_test_session.rb'
+    - 'lib/gitlab/qa/report/relate_failure_issue.rb'
+    - 'lib/gitlab/qa/report/update_screenshot_path.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/gitlab/qa/reporter.rb'
+
+# Offense count: 126
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 192

data/docs/what_tests_can_be_run.md

@@ -115,9 +115,23 @@ This will first disable `feature_flag_name` flag and run the tests and then enab
 
 You can pass any number of feature flag settings. The tests will run once for each setting.
 
-See the [QA framework documentation](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/README.md#running-tests-with-a-feature-flag-enabled)
+See the [QA framework documentation](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/README.md#running-tests-with-a-feature-flag-enabled-or-disabled)
 for information on running the tests with different feature flag settings from the QA framework.
 
+## Running tests with multiple feature flags set
+
+The options above allow you to enable or disable a single feature flag at a time. However, if you want to set more than
+one feature flag at the same time you'll need to use `--set-feature-flags` instead.
+
+The desired state must be set individually for each feature flag in a comma-separated list. For example to disable a feature flag
+named `feature-one` and enable another named `feature-two`, use the following parameters:
+
+```shell
+--set-feature-flags feature-one=disable,feature-two=enable
+```
+
+Those parameters will instruct GitLab QA to set both feature flags before running the suite of tests.
+
 ## Specifying the GitLab version
 
 In each of the examples below, it is possible to test a specific version of GitLab

data/gitlab-qa.gemspec

@@ -20,17 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # Some dependencies are pinned, to prevent new cops from breaking the CI pipelines
   spec.add_development_dependency 'climate_control', '~> 0.2'
-  spec.add_development_dependency 'gitlab-styles', '~> 4.3.0'
+  spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 12.2'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.82.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
   spec.add_development_dependency 'solargraph', '~> 0.41'
   spec.add_development_dependency 'webmock', '3.7.0'
-  spec.add_runtime_dependency 'activesupport', '~> 6.0.2'
+  spec.add_runtime_dependency 'activesupport', '~> 6.1'
   spec.add_runtime_dependency 'gitlab', '~> 4.16.1'
   spec.add_runtime_dependency 'http', '4.3.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'

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

@@ -9,7 +9,7 @@ module Gitlab
     module Component
       class Minio < Base
         DOCKER_IMAGE = 'minio/minio'.freeze
-        DOCKER_IMAGE_TAG = 'latest'.freeze
+        DOCKER_IMAGE_TAG = 'RELEASE.2021-09-15T04-54-25Z'.freeze
         # 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
@@ -19,7 +19,7 @@ module Gitlab
         def initialize
           super
 
-          @environment = { MINIO_ACCESS_KEY: AWS_ACCESS_KEY, MINIO_SECRET_KEY: AWS_SECRET_KEY }
+          @environment = { MINIO_ROOT_USER: AWS_ACCESS_KEY, MINIO_ROOT_PASSWORD: AWS_SECRET_KEY }
           @volumes = { host_data_dir => DATA_DIR }
           @buckets = []
         end

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

@@ -16,7 +16,7 @@ module Gitlab
           @env = {}
         end
 
-        def perform # rubocop:disable Metrics/AbcSize
+        def perform
           return puts "Skipping tests." if skip_tests?
 
           raise ArgumentError unless [suite, release].all?
@@ -31,15 +31,14 @@ module Gitlab
 
           feature_flag_sets = []
 
-          # When `args` includes `[..., "--disable-feature", "a", "--enable-feature", "b", ...]`
-          # `feature_flag_sets` will be set to `[["--disable-feature", "a"], ["--enable-feature", "b"]]`
-          # This will result in tests running twice, once with each feature.
+          # 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)
           end
 
-          # When `args` do not have either "--disable-feature" or "--enable-feature", we
-          # add [] so that test is run exactly once.
+          # When `args` do not have any feature flag options, we add [] so that test is run exactly once.
           feature_flag_sets << [] unless feature_flag_sets.any?
 
           feature_flag_sets.each do |feature_flag_set|

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

@@ -13,7 +13,7 @@ module Gitlab
           puts "Docker shell command: `#{@command.mask_secrets}`"
         end
 
-        def execute!
+        def execute! # rubocop:disable Metrics/AbcSize
           raise StatusError, 'Command already executed' if @output.any?
 
           Open3.popen2e(@command.to_s) do |_in, out, wait|

data/lib/gitlab/qa/runner.rb

@@ -18,7 +18,7 @@ module Gitlab
         @omnibus_configurations = %w[default] # always load default configuration
 
         @options = OptionParser.new do |opts|
-          opts.banner = 'Usage: gitlab-qa [options] Scenario URL [[--] path] [rspec_options]'
+          opts.banner = 'Usage: gitlab-qa Scenario URL [options] [[--] path] [rspec_options]'
 
           opts.on('--no-teardown', 'Skip teardown of containers after the scenario completes.') do
             Runtime::Scenario.define(:teardown, false)

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

@@ -104,7 +104,11 @@ module Gitlab
           'AWS_S3_KEY_ID' => :aws_s3_key_id,
           'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
           'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
-          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid
+          'TOP_UPSTREAM_MERGE_REQUEST_IID' => :top_upstream_merge_request_iid,
+          'GOOGLE_PROJECT' => :google_project,
+          'GOOGLE_CLIENT_EMAIL' => :google_client_email,
+          'GOOGLE_JSON_KEY' => :google_json_key,
+          'GCS_BUCKET_NAME' => :gcs_bucket_name
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -299,6 +303,12 @@ module Gitlab
           end
         end
 
+        def require_gcs_environment!
+          %w[GOOGLE_PROJECT GOOGLE_CLIENT_EMAIL GOOGLE_JSON_KEY GCS_BUCKET_NAME].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run GCS object storage specs" unless ENV.key?(env_key)
+          end
+        end
+
         def require_initial_password!
           return unless ENV['GITLAB_INITIAL_ROOT_PASSWORD'].to_s.strip.empty?
 

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require 'tempfile'
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class ObjectStorageGcs < Default
+          def configuration
+            Runtime::Env.require_gcs_environment!
+
+            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']['objects']['artifacts']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['lfs']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['uploads']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['packages']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['pages']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+              gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = '#{Runtime::Env.gcs_bucket_name}'
+            OMNIBUS
+          end
+
+          def setup_json_key
+            Tempfile.open('gcs-json-key', ENV['CI_PROJECT_DIR']) do |file|
+              file.write(ENV.fetch('GOOGLE_JSON_KEY'))
+
+              file
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,6 @@ module Gitlab
               @tag = 'client_ssl'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
@@ -42,7 +41,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
 
             def gitlab_omnibus
               <<~OMNIBUS
@@ -53,7 +51,7 @@ module Gitlab
                 nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/gitlab.test.key';
 
                 nginx['ssl_verify_client'] = 'on';
-                nginx['ssl_client_certificate'] = '/etc/gitlab/authority/ca.pem';
+                nginx['ssl_client_certificate'] = '/etc/gitlab/trusted-certs/ca.pem';
                 nginx['ssl_verify_depth'] = '2';
               OMNIBUS
             end

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

@@ -4,10 +4,7 @@ module Gitlab
       module Test
         module Integration
           class Geo < Scenario::Template
-            ##
             # rubocop:disable Lint/MissingCopEnableDirective
-            # rubocop:disable Metrics/AbcSize
-            #
             def perform(release, *rspec_args)
               release = QA::Release.new(release)
 

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

@@ -19,7 +19,6 @@ module Gitlab
               @tag = 'gitaly_cluster'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               gitaly_primary_node = gitaly(@primary_node_name, release)
               gitaly_secondary_node = gitaly(@secondary_node_name, release)
@@ -74,7 +73,6 @@ module Gitlab
               gitaly_secondary_node&.teardown
               gitaly_tertiary_node&.teardown
             end
-            # rubocop:enable Metrics/AbcSize
 
             private
 

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

@@ -6,7 +6,6 @@ module Gitlab
       module Test
         module Integration
           class Kubernetes < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Runtime::Env.require_kubernetes_environment!
 
@@ -47,7 +46,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
           end
         end
       end

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

@@ -13,7 +13,6 @@ module Gitlab
               @tag = 'mtls'
             end
 
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitaly|
                 gitaly.release = QA::Release.new(release)
@@ -53,7 +52,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
 
             def gitlab_omnibus
               <<~OMNIBUS

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

@@ -6,7 +6,6 @@ module Gitlab
       module Test
         module Integration
           class SSHTunnel < Scenario::Template
-            # rubocop:disable Metrics/AbcSize
             def perform(release, *rspec_args)
               Runtime::Env.override_default_password!
               Runtime::Env.require_ssh_tunnel!
@@ -49,7 +48,6 @@ module Gitlab
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
           end
         end
       end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.8.4'.freeze
+    VERSION = '7.9.2'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -15,6 +15,7 @@ module Gitlab
         autoload :Packages, 'gitlab/qa/runtime/omnibus_configurations/packages'
         autoload :ObjectStorage, 'gitlab/qa/runtime/omnibus_configurations/object_storage'
         autoload :ObjectStorageAws, 'gitlab/qa/runtime/omnibus_configurations/object_storage_aws'
+        autoload :ObjectStorageGcs, 'gitlab/qa/runtime/omnibus_configurations/object_storage_gcs'
         autoload :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.8.4
+  version: 7.9.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.82.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.82.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +266,7 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
+- lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/packages.rb
 - lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb