gitlab-qa 7.25.0 → 7.27.0

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

@@ -0,0 +1,19 @@
+ce:service_ping_disabled:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
+ee:service_ping_disabled:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"

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

@@ -0,0 +1,19 @@
+ce:smtp:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"
+
+ee:smtp:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"

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

@@ -0,0 +1,10 @@
+staging:
+  script:
+    - unset EE_LICENSE
+    - 'echo "Running: bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
+    - bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
+  extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+  allow_failure: true

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

@@ -0,0 +1,60 @@
+ce:update-parallel:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 5
+
+ce:update:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ce:update-quarantine:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .quarantine
+    - .rspec-report-opts
+    - .update-scenario-script
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
+
+ee:update-parallel:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 10
+
+ee:update:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ee:update-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"

data/.gitlab/issue_templates/Default.md

@@ -11,3 +11,5 @@ If you feel that your issue can be categorized as a reproducible bug or a featur
 
 Thank you for helping to make GitLab a better product.
 -->
+
+<!-- template sourced from https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/.gitlab/issue_templates/Default.md -->

data/.gitlab/merge_request_templates/Default.md

@@ -44,3 +44,5 @@ This checklist encourages us to confirm any changes have been analyzed to reduce
 * [ ] I have evaluated the [MR acceptance checklist](https://docs.gitlab.com/ee/development/code_review.html#acceptance-checklist) for this MR.
 
 /label ~QA ~Quality
+
+<!-- template sourced from https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/.gitlab/merge_request_templates/Default.md -->

data/.gitlab-ci.yml

@@ -49,7 +49,13 @@ prepare:
   stage: generate
   extends: .rules:never-on-version-change-or-tag
   script:
-    - 'export QA_IMAGE_TAG=${TOP_UPSTREAM_SOURCE_REF:=master} && echo "QA_IMAGE_TAG=$QA_IMAGE_TAG" >> prep_vars.env'
+    - |
+      if [[ $TOP_UPSTREAM_SOURCE_PROJECT == "gitlab-org/gitlab" && -n $TOP_UPSTREAM_SOURCE_SHA ]]; then
+        export QA_IMAGE_TAG=${TOP_UPSTREAM_SOURCE_SHA}
+      else
+        export QA_IMAGE_TAG=master
+      fi
+    - 'echo "QA_IMAGE_TAG=$QA_IMAGE_TAG" >> prep_vars.env'
     - 'echo $QA_IMAGE_TAG'
   artifacts:
     reports:
@@ -58,40 +64,6 @@ prepare:
       - prep_vars.env
 
 generate-jobs:
-  stage: generate
-  extends: .rules:never-on-version-change-or-tag
-  script:
-    # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.
-    - 'export TOP_UPSTREAM_DEFAULT_BRANCH=${TOP_UPSTREAM_DEFAULT_BRANCH:=master} && echo "TOP_UPSTREAM_DEFAULT_BRANCH=$TOP_UPSTREAM_DEFAULT_BRANCH" >> variables.env'
-    - 'echo "RELEASE=$RELEASE" >> variables.env'
-    - 'echo "GITLAB_QA_OPTIONS=$GITLAB_QA_OPTIONS" >> variables.env'
-    - 'echo "QA_TESTS=$QA_TESTS" >> variables.env'
-    - 'echo "KNAPSACK_GENERATE_REPORT=$KNAPSACK_GENERATE_REPORT" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_JOB=$TOP_UPSTREAM_SOURCE_JOB" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_REF=$TOP_UPSTREAM_SOURCE_REF" >> variables.env'
-    - 'echo "DISABLE_RELATING_FAILURE_ISSUES=$DISABLE_RELATING_FAILURE_ISSUES" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_PROJECT=$TOP_UPSTREAM_SOURCE_PROJECT" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_SHA=$TOP_UPSTREAM_SOURCE_SHA" >> variables.env'
-    - 'echo "NOTIFY_CHANNEL=$NOTIFY_CHANNEL" >> variables.env'
-    - 'echo "QA_IMAGE=$QA_IMAGE" >> variables.env'
-    - 'echo "EE_LICENSE=$EE_LICENSE" >> variables.env'
-    - 'echo "TOP_UPSTREAM_MERGE_REQUEST_IID=$TOP_UPSTREAM_MERGE_REQUEST_IID" >> variables.env'
-    - 'echo "ALLURE_JOB_NAME=$ALLURE_JOB_NAME" >> variables.env'
-
-    - ./scripts/generate-qa-jobs.rb
-    - cat generated-qa-jobs.yml
-  artifacts:
-    reports:
-      dotenv: variables.env
-    paths:
-      - generated-qa-jobs.yml
-      - variables.env
-    expire_in: 2 days
-  needs:
-    - job: generate-count-example-files
-      artifacts: true
-
-generate-count-example-files:
   stage: generate
   extends: .rules:never-on-version-change-or-tag
   image:
@@ -104,8 +76,9 @@ generate-count-example-files:
   before_script:
     - cd /home/gitlab/qa
   script:
+    # Generate count example files
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS
-    - bundle exec bin/qa Test::Integration::Mattermost http://dummy.test http://mattermost.test --count-examples-only -- $QA_TESTS
+    - bundle exec bin/qa Test::Integration::Mattermost http://dummy.test --mattermost-address http://mattermost.test --count-examples-only -- $QA_TESTS
     - bundle exec bin/qa Test::Integration::ServicePingDisabled http://dummy.test --count-examples-only -- $QA_TESTS
     - bundle exec bin/qa QA::EE::Scenario::Test::Geo --count-examples-only --primary-address http://dummy1.test --primary-name gitlab-primary --secondary-address http://dummy2.test --secondary-name gitlab-secondary --without-setup
     - bundle exec bin/qa Test::Integration::LDAPNoTLS http://dummy.test --count-examples-only -- $QA_TESTS
@@ -127,12 +100,37 @@ generate-count-example-files:
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag can_use_large_setup
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag cloud_activation
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag object_storage
-
     - cp -r no_of_examples $CI_PROJECT_DIR
+
+    # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.
+    - 'export TOP_UPSTREAM_DEFAULT_BRANCH=${TOP_UPSTREAM_DEFAULT_BRANCH:=master} && echo "TOP_UPSTREAM_DEFAULT_BRANCH=$TOP_UPSTREAM_DEFAULT_BRANCH" >> variables.env'
+    - 'echo "RELEASE=$RELEASE" >> variables.env'
+    - 'echo "GITLAB_QA_OPTIONS=$GITLAB_QA_OPTIONS" >> variables.env'
+    - 'echo "QA_TESTS=$QA_TESTS" >> variables.env'
+    - 'echo "KNAPSACK_GENERATE_REPORT=$KNAPSACK_GENERATE_REPORT" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_JOB=$TOP_UPSTREAM_SOURCE_JOB" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_REF=$TOP_UPSTREAM_SOURCE_REF" >> variables.env'
+    - 'echo "DISABLE_RELATING_FAILURE_ISSUES=$DISABLE_RELATING_FAILURE_ISSUES" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_PROJECT=$TOP_UPSTREAM_SOURCE_PROJECT" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_SHA=$TOP_UPSTREAM_SOURCE_SHA" >> variables.env'
+    - 'echo "NOTIFY_CHANNEL=$NOTIFY_CHANNEL" >> variables.env'
+    - 'echo "QA_IMAGE=$QA_IMAGE" >> variables.env'
+    - 'echo "EE_LICENSE=$EE_LICENSE" >> variables.env'
+    - 'echo "TOP_UPSTREAM_MERGE_REQUEST_IID=$TOP_UPSTREAM_MERGE_REQUEST_IID" >> variables.env'
+    - 'echo "ALLURE_JOB_NAME=$ALLURE_JOB_NAME" >> variables.env'
+    - mv variables.env $CI_PROJECT_DIR
+
+    - cd $CI_PROJECT_DIR
+    - ./scripts/generate-qa-jobs.rb
+    - cat generated-qa-jobs.yml
   artifacts:
+    reports:
+      dotenv: variables.env
     paths:
+      - generated-qa-jobs.yml
+      - variables.env
       - no_of_examples
-  allow_failure: true
+    expire_in: 2 days
 
 trigger-generated-jobs:
   stage: triggers

data/bin/notify_upstream

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'gitlab'
+
+# Default to "Multi-pipeline (from 'gitlab-org/gitlab-qa' 'notify_upstream:*' jobs)" from current project
+api_token = ENV.fetch('GITLAB_QA_PROJECT_ACCESS_TOKEN') do
+  puts "The $GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN variable is deprecated in favor of a dedicated project access token: $GITLAB_QA_PROJECT_ACCESS_TOKEN."
+  puts "See https://gitlab.com/groups/gitlab-org/quality/-/epics/17 for more details."
+  ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
+end
+
+# Configure credentials to be used with gitlab gem
+Gitlab.configure do |config|
+  config.endpoint = 'https://gitlab.com/api/v4'
+  config.private_token = api_token
+end
+
+class CommitComment
+  UPSTREAM_COMMENT = <<~COMMENT
+    - The [`gitlab-qa-mirror` downstream pipeline](%<pipeline_url>s) for https://gitlab.com/%<project_path>s/-/merge_requests/%<mr_iid>s/diffs?commit_id=%<commit_sha>s %<status_with_icon>s
+  COMMENT
+  IDENTIFIABLE_NOTE_TAG = 'gitlab-qa:upstream-notification-note'
+
+  def self.mr?
+    ENV.key?('TOP_UPSTREAM_SOURCE_PROJECT') &&
+      ENV.key?('TOP_UPSTREAM_MERGE_REQUEST_IID') &&
+      ENV.key?('TOP_UPSTREAM_SOURCE_SHA') &&
+      !ENV['TOP_UPSTREAM_SOURCE_PROJECT'].to_s.empty? &&
+      !ENV['TOP_UPSTREAM_MERGE_REQUEST_IID'].to_s.empty? &&
+      !ENV['TOP_UPSTREAM_SOURCE_SHA'].to_s.empty?
+  end
+
+  def self.post!(status)
+    unless mr?
+      puts "All the 'TOP_UPSTREAM_SOURCE_PROJECT', 'TOP_UPSTREAM_MERGE_REQUEST_IID', and 'TOP_UPSTREAM_SOURCE_SHA' environment variables need to be present. We cannot post a comment on the upstream merge request."
+      return
+    end
+
+    # Look for an existing note
+    upstream_notification_note = Gitlab.merge_request_notes(project_path, mr_iid).auto_paginate.find do |note|
+      note.body.include?(IDENTIFIABLE_NOTE_TAG)
+    end
+
+    if upstream_notification_note
+      Gitlab.edit_merge_request_note(project_path, mr_iid, upstream_notification_note.id, [upstream_notification_note.body, build_comment(status)].join("\n"))
+    else
+      Gitlab.create_merge_request_comment(project_path, mr_iid, "<!-- #{IDENTIFIABLE_NOTE_TAG} -->\n#{build_comment(status)}")
+    end
+  rescue Gitlab::Error::Error => error
+    puts "Ignoring the following error: #{error}"
+  end
+
+  def self.project_path
+    ENV['TOP_UPSTREAM_SOURCE_PROJECT']
+  end
+
+  def self.mr_iid
+    ENV['TOP_UPSTREAM_MERGE_REQUEST_IID']
+  end
+
+  def self.pipeline_url
+    ENV['CI_PIPELINE_URL']
+  end
+
+  def self.commit_sha
+    ENV['TOP_UPSTREAM_SOURCE_SHA']
+  end
+
+  def self.build_comment(status)
+    format(UPSTREAM_COMMENT,
+      project_path: project_path,
+      mr_iid: mr_iid,
+      pipeline_url: pipeline_url,
+      status_with_icon: status_with_icon(status),
+      commit_sha: commit_sha
+    )
+  end
+
+  def self.status_with_icon(status)
+    case status
+    when :success
+      "passed. :white_check_mark:"
+    when :failure
+      "failed! :boom:"
+    end
+  end
+
+  def self.post_to_mr(project_id, mr_iid, comment)
+    Gitlab.create_merge_request_comment(project_id, mr_iid, comment)
+  end
+end
+
+status = ARGV.shift.to_s.strip
+
+abort "Please provide a status!" if status == ''
+
+CommitComment.post!(status.to_sym)

data/docs/what_tests_can_be_run.md

@@ -637,6 +637,8 @@ container is spun up and tests are run from it by running the
 - `JIRA_ADMIN_USERNAME`: Username for authenticating with Jira server as admin.
 - `JIRA_ADMIN_PASSWORD`: Password for authenticating with Jira server as admin.
 
+These values can be found in the shared GitLab QA 1Password vault.
+
 Example:
 
 ```

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

@@ -124,7 +124,6 @@ module Gitlab
 
           return unless docker.running?(name)
 
-          docker.stop(name)
           docker.remove(name)
         end
 
@@ -147,11 +146,23 @@ module Gitlab
         end
 
         def instance_no_teardown
-          prepare
-          start
-          reconfigure
-          wait_until_ready
-          process_exec_commands
+          begin
+            retries ||= 0
+            prepare
+            start
+            reconfigure
+            wait_until_ready
+            process_exec_commands
+          rescue Docker::Shellout::StatusError => e
+            # for scenarios where a service fails during startup, attempt to retry to avoid flaky failures
+            if (retries += 1) < 3
+              puts "Retry instance_no_teardown due to Docker::Shellout::StatusError -- attempt #{retries}"
+              teardown!
+              retry
+            end
+
+            raise e
+          end
 
           yield self if block_given?
         end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
 require 'net/http'
@@ -14,7 +15,7 @@ module Gitlab
         extend Forwardable
 
         attr_reader :release, :omnibus_configuration, :omnibus_gitlab_rails_env
-        attr_accessor :tls, :skip_availability_check, :runner_network
+        attr_accessor :tls, :skip_availability_check, :runner_network, :seed_admin_token, :seed_db
         attr_writer :name, :relative_path
 
         def_delegators :release, :tag, :image, :edition
@@ -42,8 +43,10 @@ module Gitlab
           @volumes[@gitlab_cert_path] = SSL_PATH
           @volumes[@authority_cert_path] = TRUSTED_PATH
 
+          @seed_admin_token = Runtime::Scenario.seed_admin_token
+          @seed_db = Runtime::Scenario.seed_db
+
           self.release = 'CE'
-          self.exec_commands += seed_test_data_command if Runtime::Scenario.seed_db
         end
 
         def set_formless_login_token
@@ -154,8 +157,7 @@ module Gitlab
           @docker.attach(name) do |line, wait|
             puts line
             # TODO, workaround which allows to detach from the container
-            #
-            break if line =~ /gitlab Reconfigured!/
+            break if /gitlab Reconfigured!/.match?(line)
           end
         end
 
@@ -163,7 +165,6 @@ module Gitlab
           return if skip_availability_check
 
           if Availability.new(name, relative_path: relative_path, scheme: scheme, protocol_port: port.to_i).check(Runtime::Env.gitlab_availability_timeout)
-            sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else
             abort ' -> GitLab unavailable!'
@@ -171,9 +172,13 @@ module Gitlab
         end
 
         def process_exec_commands
-          @docker.copy(name, DATA_SEED_PATH, DATA_PATH) if Runtime::Scenario.seed_db
+          @docker.copy(name, DATA_SEED_PATH, DATA_PATH) if seed_admin_token || seed_db
+
+          self.exec_commands += seed_admin_token_command if seed_admin_token
+          self.exec_commands += seed_test_data_command if seed_db
 
-          exec_commands.each { |command| @docker.exec(name, command) }
+          Runtime::Logger.info("Running exec_commands...")
+          exec_commands.flatten.uniq.each { |command| @docker.exec(name, command) }
         end
 
         def sha_version
@@ -231,6 +236,10 @@ module Gitlab
           cmd.uniq
         end
 
+        def seed_admin_token_command
+          ["gitlab-rails runner #{DATA_PATH}/admin_access_token_seed.rb"]
+        end
+
         class Availability
           def initialize(name, relative_path: '', scheme: 'http', protocol_port: 80)
             @docker = Docker::Engine.new
@@ -276,3 +285,4 @@ module Gitlab
     end
   end
 end
+# rubocop:enable Metrics/AbcSize

data/lib/gitlab/qa/report/gitlab_issue_client.rb

@@ -101,6 +101,18 @@ module Gitlab
           end
         end
 
+        def upload_file(file_fullpath:)
+          ignore_gitlab_client_exceptions do
+            Gitlab.upload_file(project, file_fullpath)
+          end
+        end
+
+        def ignore_gitlab_client_exceptions
+          yield
+        rescue StandardError, SystemCallError, OpenSSL::SSL::SSLError, Net::OpenTimeout, Net::ReadTimeout, Gitlab::Error::Error => e
+          puts "Ignoring the following error: #{e}"
+        end
+
         def handle_gitlab_client_exceptions
           yield
         rescue Gitlab::Error::NotFound

data/lib/gitlab/qa/report/relate_failure_issue.rb

@@ -47,7 +47,7 @@ module Gitlab
           puts "  => Searching issues for test '#{test.name}'..."
 
           begin
-            issue = find_and_link_issue(test) || create_issue(test)
+            issue = test.quarantine? ? find_and_link_issue(test) : find_and_link_issue(test) || create_issue(test)
             return unless issue
 
             update_labels(issue, test)
@@ -72,6 +72,8 @@ module Gitlab
           issue = super
           puts "for test '#{test.name}'."
 
+          post_or_update_failed_job_note(issue, test)
+
           issue
         end
 
@@ -82,10 +84,17 @@ module Gitlab
           end
         end
 
+        def full_stacktrace(test)
+          if test.failures.first['message_lines'].empty?
+            test.failures.first['message']
+          else
+            test.failures.first['message_lines'].join("\n")
+          end
+        end
+
         def find_relevant_failure_issues(test) # rubocop:disable Metrics/AbcSize
           ld = Class.new.extend(Gem::Text).method(:levenshtein_distance)
-          full_stacktrace = test.failures.first['message_lines'].join("\n")
-          first_test_failure_stacktrace = sanitize_stacktrace(full_stacktrace, FAILURE_STACKTRACE_REGEX) || full_stacktrace
+          first_test_failure_stacktrace = sanitize_stacktrace(full_stacktrace(test), FAILURE_STACKTRACE_REGEX) || full_stacktrace(test)
           clean_first_test_failure_stacktrace = remove_unique_resource_names(first_test_failure_stacktrace)
 
           # Search with the `search` param returns 500 errors, so we filter by ~QA and then filter further in Ruby
@@ -156,9 +165,10 @@ module Gitlab
         def new_issue_description(test)
           super + [
             "\n\n### Stack trace",
-            "```\n#{test.failures.first['message_lines'].join("\n")}\n```",
+            "```\n#{full_stacktrace(test)}\n```",
             "First happened in #{test.ci_job_url}.",
-            "Related test case: #{test.testcase}."
+            "Related test case: #{test.testcase}.",
+            screenshot_section(test)
           ].join("\n\n")
         end
 
@@ -194,6 +204,20 @@ module Gitlab
 
           false
         end
+
+        def screenshot_section(test)
+          section = ''
+
+          failure = full_stacktrace(test)
+
+          if test.screenshot? && !failure.include?('500 Internal Server Error') && !failure.include?('fabricate_via_api!')
+            relative_url = gitlab.upload_file(file_fullpath: test.failure_screenshot)
+
+            section = "### Screenshot: #{relative_url.markdown}"
+          end
+
+          section
+        end
       end
     end
   end

data/lib/gitlab/qa/report/test_result.rb

@@ -95,6 +95,14 @@ module Gitlab
             report['quarantine']['issue'] if quarantine?
           end
 
+          def screenshot?
+            report['screenshot'].present?
+          end
+
+          def failure_screenshot
+            report['screenshot']['image'] if screenshot?
+          end
+
           private
 
           # rubocop:disable Metrics/AbcSize

data/lib/gitlab/qa/report/update_screenshot_path.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+require 'json'
+require 'active_support/core_ext/object/blank'
 
 module Gitlab
   module QA
@@ -9,30 +11,50 @@ module Gitlab
         end
 
         REGEX = %r{(?<gitlab_qa_run>gitlab-qa-run-.*?(?=\/))\/(?<gitlab_ce_ee_qa>gitlab-(ee|ce)-qa-.*?(?=\/))}
+        CONTAINER_PATH = File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp').freeze
 
         def invoke!
           Dir.glob(@files).each do |rspec_report_file|
-            report = rewrite_each_screenshot_path(rspec_report_file)
+            match_data = rspec_report_file.match(REGEX)
+            artifact_path = "#{match_data[:gitlab_qa_run]}/#{match_data[:gitlab_ce_ee_qa]}"
 
-            File.write(rspec_report_file, report)
+            xml_report = rewrite_each_xml_screenshot_path(rspec_report_file, artifact_path)
+
+            File.write(rspec_report_file, xml_report)
 
             puts "Saved #{rspec_report_file}"
+
+            json_rspec_report_file = rspec_report_file.gsub('.xml', '.json')
+            json_report = rewrite_each_json_screenshot_path(json_rspec_report_file, artifact_path)
+
+            File.write(json_rspec_report_file, json_report)
+
+            puts "Saved #{json_rspec_report_file}"
           end
         end
 
         private
 
-        def rewrite_each_screenshot_path(rspec_report_file)
+        def rewrite_each_xml_screenshot_path(rspec_report_file, artifact_path)
           report = Nokogiri::XML(File.open(rspec_report_file))
 
-          match_data = rspec_report_file.match(REGEX)
-
           report.xpath('//system-out').each do |system_out|
-            system_out.content = system_out.content.gsub(File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'), "#{match_data[:gitlab_qa_run]}/#{match_data[:gitlab_ce_ee_qa]}")
+            system_out.content = system_out.content.gsub(CONTAINER_PATH, artifact_path)
           end
 
           report.to_s
         end
+
+        def rewrite_each_json_screenshot_path(json_rspec_report_file, artifact_path)
+          report = JSON.parse(File.read(json_rspec_report_file))
+          examples = report['examples']
+
+          examples.each do |example|
+            example['screenshot']['image'] = example['screenshot']['image'].gsub(CONTAINER_PATH, artifact_path) if example['screenshot'].present?
+          end
+
+          JSON.pretty_generate(report)
+        end
       end
     end
   end

data/lib/gitlab/qa/runner.rb

@@ -13,6 +13,8 @@ module Gitlab
         Runtime::Scenario.define(:qa_image, Runtime::Env.qa_image) if Runtime::Env.qa_image
         Runtime::Scenario.define(:omnibus_configuration, Runtime::OmnibusConfiguration.new)
         Runtime::Scenario.define(:seed_db, false)
+        Runtime::Scenario.define(:seed_admin_token, true) # Create an admin access token for root user by default
+        Runtime::Scenario.define(:omnibus_exec_commands, [])
 
         # Omnibus Configurators specified by flags
         @active_configurators = []
@@ -31,6 +33,10 @@ module Gitlab
             Runtime::Scenario.define(:teardown, false)
           end
 
+          opts.on('--no-admin-token', 'Skip admin token creation for root user') do
+            Runtime::Scenario.define(:seed_admin_token, false)
+          end
+
           opts.on('--qa-image QA_IMAGE', String, 'Specifies a QA image to be used instead of inferring it from the GitLab image. See Gitlab::QA::Release#qa_image') do |value|
             Runtime::Scenario.define(:qa_image, value)
           end
@@ -135,6 +141,7 @@ module Gitlab
             # # Runtime::OmnibusConfiguration::Packages
             # gitlab_rails['packages_enabled'] = true
             Runtime::Scenario.omnibus_configuration << "# #{configurator.class.name}"
+            Runtime::Scenario.omnibus_exec_commands << configurator.exec_commands
 
             # Load the configuration
             configurator.configuration.split("\n").each { |c| Runtime::Scenario.omnibus_configuration << c }

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

@@ -217,7 +217,7 @@ module Gitlab
         end
 
         def elastic_version
-          env_var_value_if_defined('ELASTIC_VERSION') || '6.4.2'.freeze
+          env_var_value_if_defined('ELASTIC_VERSION') || '7.17.0'.freeze
         end
 
         def require_license!

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

@@ -33,7 +33,7 @@ module Gitlab
         # @return Any instance of [Gitlab::QA::Component::Base]
         def prepare; end
 
-        # Commands to execute before GitLab boots
+        # Commands to execute before tests are run against GitLab (after reconfigure)
         def exec_commands
           []
         end