gitlab-qa 7.8.2 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810415c165fae1c9b410bf57284a5535ccdef3ab45df9832cf222554dd4db3dd
-  data.tar.gz: 2d0d33f6d0adb101292f6696868793dbfaf749150114a7e65d84a94ba05f06c0
+  metadata.gz: 24eecf2dd51ae68e0329202fc5af2cea9b8117f8951833773f8a41a446937468
+  data.tar.gz: 0b09b0122282d99f8af09cd075b4c00cdc0ef89b5d8f7b60087143c7038464be
 SHA512:
-  metadata.gz: fe0d8face8f36b1c923ad115d28d75c5ecdb0d6621c70f7826fd3dfe3da8b5848b4726709b307046d56638943fa6fa020b287d5459a8af9082c97ff237d712d2
-  data.tar.gz: 050fd0d3de3e41e0f8a8243892e0aae0a52ad7c716d29a23cde2ec7655986110550f5d22d46276b8d94f45f93e015d843411a7f9c1e8136a2012a4f6cfa22587
+  metadata.gz: db871aedf8de37c94394776c01f7e93ab08970e85b70ec0e1f67ee7cacf66f4b3b0a21bf32d43e5e92e41906beb0b553bd40ea1d754b0fb721e137060825b460
+  data.tar.gz: 3510bb706ff671ce5b818e5ed4d0457e627c96fadd2e909799aa56947dcaf678ebdc6a2b3a643e45783e0bcbd9b9c8bccff27e36315f37ae45d5c3d5f4119604

data/.gitlab-ci.yml

@@ -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
@@ -158,6 +181,7 @@ rspec:
 ce:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
@@ -168,6 +192,7 @@ ce:sanity-framework:
 ee:sanity-framework:
   variables:
     QA_GENERATE_ALLURE_REPORT: "false"
+    QA_EXPORT_TEST_METRICS: "false"
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
@@ -175,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
 
@@ -335,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:
@@ -646,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:
@@ -656,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:
@@ -665,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
@@ -677,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:
@@ -686,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:
@@ -697,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:
@@ -707,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:
@@ -718,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:

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/lib/gitlab/qa/component/specs.rb

@@ -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/report/results_in_issues.rb

@@ -19,6 +19,8 @@ module Gitlab
             puts "Reporting tests in #{test_results.path}"
 
             test_results.each do |test|
+              puts "Reporting test: #{test.file} | #{test.name}\n"
+
               report_test(test) unless test.skipped
             end
 
@@ -27,19 +29,18 @@ module Gitlab
         end
 
         def report_test(test)
-          puts "Reporting test: #{test.file} | #{test.name}"
-
           testcase = find_testcase(test) || create_testcase(test)
           test.testcase ||= testcase.web_url.sub('/issues/', '/quality/test_cases/')
 
-          issue = find_issue_by_iid(testcase, test)
+          issue = find_linked_results_issue_by_iid(testcase, test)
 
-          unless issue
+          if issue
+            issue = update_issue_title(issue, test, 'issue') if issue.title.strip != title_from_test(test)
+          else
             puts "No valid issue link found"
-            issue = find_or_create_issue(test)
+            issue = find_or_create_results_issue(test)
 
             add_issue_to_testcase(testcase, issue)
-            puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
           end
 
           update_labels(testcase, test)
@@ -47,18 +48,47 @@ module Gitlab
         end
 
         def find_testcase(test)
-          iid = iid_from_testcase_url(test.testcase)
+          testcase = find_testcase_by_iid(test)
+
+          if testcase
+            testcase = update_issue_title(testcase, test, 'test_case') if testcase.title.strip != title_from_test(test)
+          else
+            testcase = find_issue(test, 'test_case')
+          end
+
+          testcase
+        end
+
+        def find_testcase_by_iid(test)
+          iid = testcase_iid_from_url(test.testcase)
 
-          testcases = search_issues(test: test, issue_type: 'test_case', iid: iid)
+          return unless iid
+
+          find_issue_by_iid(iid, 'test_case')
+        end
+
+        def find_linked_results_issue_by_iid(testcase, test)
+          iid = issue_iid_from_testcase(testcase)
 
-          if iid && testcases.blank?
-            warn(%(Test case url "#{test.testcase}" not valid))
-            testcases = search_issues(test: test, issue_type: 'test_case')
+          return unless iid
+
+          find_issue_by_iid(iid, 'issue')
+        end
+
+        def find_issue_by_iid(iid, issue_type)
+          issues = gitlab.find_issues(iid: iid) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type
           end
 
-          warn(%(Too many test cases found with the file path "#{test.file}" and name "#{test.name}")) if testcases&.many?
+          warn(%(#{issue_type} iid "#{iid}" not valid)) if issues.empty?
 
-          testcases.first
+          issues.first
+        end
+
+        def update_issue_title(issue, test, issue_type)
+          warn(%(#{issue_type} title needs to be updated from '#{issue.title.strip}' to '#{title_from_test(test)}'))
+
+          gitlab.edit_issue(iid: issue.iid, options: { title: title_from_test(test) })
         end
 
         def create_testcase(test)
@@ -73,7 +103,7 @@ module Gitlab
           )
         end
 
-        def iid_from_testcase_url(url)
+        def testcase_iid_from_url(url)
           return warn(%(\nPlease update #{url} to test case url")) if url&.include?('/-/issues/')
 
           url && url.split('/').last.to_i
@@ -93,7 +123,7 @@ module Gitlab
           issue_iid&.to_i
         end
 
-        def find_or_create_issue(test)
+        def find_or_create_results_issue(test)
           issue = find_issue(test, 'issue')
 
           if issue
@@ -106,22 +136,12 @@ module Gitlab
           issue
         end
 
-        def find_issue_by_iid(testcase, test)
-          iid = issue_iid_from_testcase(testcase)
-
-          return unless iid
-
-          issues = search_issues(test: test, issue_type: 'issue', iid: iid)
-
-          warn(%(Issue iid "#{iid}" not valid)) if issues.empty?
-
-          issues.first
-        end
-
         def find_issue(test, issue_type)
-          issues = search_issues(test: test, issue_type: 'issue')
+          issues = gitlab.find_issues(options: { search: search_term(test) }) do |issue|
+            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
+          end
 
-          warn(%(Too many issues found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
+          warn(%(Too many #{issue_type}s found with the file path "#{test.file}" and name "#{test.name}")) if issues.many?
 
           issues.first
         end
@@ -130,6 +150,8 @@ module Gitlab
           results_section = testcase.description.include?(RESULTS_SECTION_TEMPLATE) ? '' : RESULTS_SECTION_TEMPLATE
 
           gitlab.edit_issue(iid: testcase.iid, options: { description: (testcase.description + results_section + "\n\n#{issue.web_url}") })
+
+          puts "Added issue #{issue.web_url} to testcase #{testcase.web_url}"
         end
 
         def update_issue(issue, test)
@@ -157,12 +179,6 @@ module Gitlab
           labels << (test.failures.empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
         end
 
-        def search_issues(test:, issue_type:, iid: nil)
-          gitlab.find_issues(iid: iid, options: { search: search_term(test) }) do |issue|
-            issue.state == 'opened' && issue.issue_type == issue_type && issue.title.strip == title_from_test(test)
-          end
-        end
-
         def search_term(test)
           %("#{partial_file_path(test.file)}" "#{search_safe(test.name)}")
         end

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

@@ -35,6 +35,7 @@ module Gitlab
           'QA_INFLUXDB_URL' => :qa_influxdb_url,
           'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
           'QA_RUN_TYPE' => :qa_run_type,
+          'QA_SKIP_PULL' => :qa_skip_pull,
           'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
@@ -78,13 +79,14 @@ module Gitlab
           'CI_NODE_INDEX' => :ci_node_index,
           'CI_NODE_TOTAL' => :ci_node_total,
           'CI_PROJECT_NAME' => :ci_project_name,
+          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
+          'CI_PIPELINE_CREATED_AT' => :ci_pipeline_created_at,
+          'CI_MERGE_REQUEST_IID' => :ci_merge_request_iid,
           'GITLAB_CI' => :gitlab_ci,
-          'QA_SKIP_PULL' => :qa_skip_pull,
           'ELASTIC_URL' => :elastic_url,
           'GITLAB_QA_LOOP_RUNNER_MINUTES' => :gitlab_qa_loop_runner_minutes,
           'MAILHOG_HOSTNAME' => :mailhog_hostname,
           'SLACK_QA_CHANNEL' => :slack_qa_channel,
-          'CI_SLACK_WEBHOOK_URL' => :ci_slack_webhook_url,
           'SLACK_ICON_EMOJI' => :slack_icon_emoji,
           'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token,
           'GEO_MAX_FILE_REPLICATION_TIME' => :geo_max_file_replication_time,
@@ -101,7 +103,12 @@ module Gitlab
           'AWS_S3_REGION' => :aws_s3_region,
           'AWS_S3_KEY_ID' => :aws_s3_key_id,
           'AWS_S3_ACCESS_KEY' => :aws_s3_access_key,
-          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name
+          'AWS_S3_BUCKET_NAME' => :aws_s3_bucket_name,
+          '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|
@@ -296,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/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.8.2'.freeze
+    VERSION = '7.9.0'.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.2
+  version: 7.9.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -294,6 +294,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