gitlab-qa 6.15.1 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7423be5876c10c8dbace27a5fa18a3b0590a8bc49198f16b67f14d6b7435f9cc
-  data.tar.gz: 774eb7f437c5be8d533ac76e913883725d7b824eedeb3e4225f9200cb740cc80
+  metadata.gz: fc3ae23427dadce6649bb30dbc58dada153af79f60efb265edd5f7439facc56f
+  data.tar.gz: 9308ba475631df203f08503929787c1015fb4313b455d30a8fee2175016b1429
 SHA512:
-  metadata.gz: b680735a2f62976139e848396ae6a5b5bf23d27e25163d03003933a33be7d91e32644b20a5c2a00687a09821b97ccda0212c18f048789ed2b52ecac0eb23c22b
-  data.tar.gz: 5489e42c1191a98364f9f3e30a4b9768f0105e2b149ec731f6142334ac10336751e108116736ec214a190accf898dfed9d5c205b44dd9bed8869076eee857db7
+  metadata.gz: 89c9c13ae10ff6e8f0076fb02d365cb45ede7320901bc5b4e4ca25ae935b9af26bc7da4d48bdab172ea6c3b74092032e5c9c5f04704ee7f98b38b67a594f81e5
+  data.tar.gz: 246f02d2389dd6db83ee1aac5e7dbc3e95ebfb12f9524f11181decf68ec5c9906adaa88531da62f66c2037c800de86084e4741193c3eaced1229ce135610fb1b

data/.gitlab-ci.yml

@@ -28,7 +28,7 @@ workflow:
   rules:
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'
-    # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+    # For the default branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
     - if: '$CI_COMMIT_BRANCH == "master"'
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
@@ -42,10 +42,11 @@ variables:
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
   QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
-  QA_FAILURES_REPORTING_PROJECT: "rymai/gitlab-qa-issues"
-  # The --dry-run or --max-diff-ratio option can be set to modify the behavior of `exe/gitlab-qa-report --relate-failure-issue` without releasing a new gem version.
-  QA_FAILURES_REPORTER_OPTIONS: ""
   QA_TESTCASE_SESSIONS_PROJECT: "gitlab-org/quality/testcase-sessions"
+  # QA_DEFAULT_BRANCH is the default branch name of the instance under test.
+  QA_DEFAULT_BRANCH: "master"
+  # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.
+  TOP_UPSTREAM_DEFAULT_BRANCH: "master"
 
 .check-base:
   stage: check
@@ -77,8 +78,7 @@ rspec:
     - 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=$?
     - 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" == "master" ] || [[ "$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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" $QA_FAILURES_REPORTER_OPTIONS || true; fi
+    - 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
 
 .ce-qa:
@@ -86,7 +86,8 @@ rspec:
     DEFAULT_RELEASE: "CE"
   rules:
     # Don't run E2E jobs on release pipelines
-    - changes: ["lib/**/version.rb"]
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
       when: never
     - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/'
       when: never
@@ -103,7 +104,8 @@ rspec:
     DEFAULT_RELEASE: "EE"
   rules:
     # Don't run E2E jobs on release pipelines
-    - changes: ["lib/**/version.rb"]
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
       when: never
     - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/'
       when: never
@@ -118,7 +120,8 @@ rspec:
 .only-qa:
   rules:
     # Don't run E2E jobs on release pipelines
-    - changes: ["lib/**/version.rb"]
+    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
+      changes: ["lib/**/version.rb"]
       when: never
     - if: '$CI_COMMIT_TAG || $RELEASE'
       when: never
@@ -329,8 +332,7 @@ ce:update:
   script:
     - 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" == "master" ] || [[ "$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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" $QA_FAILURES_REPORTER_OPTIONS || true; fi
+    - 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
@@ -344,8 +346,7 @@ ce:update-quarantine:
   script:
     - 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" == "master" ] || [[ "$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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" $QA_FAILURES_REPORTER_OPTIONS || true; fi
+    - 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
@@ -358,8 +359,7 @@ ee:update:
   script:
     - 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" == "master" ] || [[ "$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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" $QA_FAILURES_REPORTER_OPTIONS || true; fi
+    - 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
@@ -373,8 +373,7 @@ ee:update-quarantine:
   script:
     - 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" == "master" ] || [[ "$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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == "master" ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" $QA_FAILURES_REPORTER_OPTIONS || true; fi
+    - 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
@@ -462,24 +461,23 @@ ee:mattermost-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
-ee:geo:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Geo"
-
-ee:geo-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Geo"
+# Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063
+# ee:geo:
+#   extends:
+#     - .test
+#     - .ee-qa
+#     - .rspec-report-opts
+#   variables:
+#     QA_SCENARIO: "Test::Integration::Geo"
+
+# ee:geo-quarantine:
+#   extends:
+#     - .test
+#     - .ee-qa
+#     - .quarantine
+#     - .rspec-report-opts
+#   variables:
+#     QA_SCENARIO: "Test::Integration::Geo"
 
 ce:ldap_no_tls:
   extends:
@@ -945,7 +943,7 @@ staging:
 generate_test_session:
   stage: report
   rules:
-    - if: '$TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == "master"'
+    - if: '$TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == $TOP_UPSTREAM_DEFAULT_BRANCH'
       when: always
     - if: '$TOP_UPSTREAM_SOURCE_JOB =~ /\Ahttps:\/\/ops.gitlab.net\//'
       when: always
@@ -958,6 +956,24 @@ generate_test_session:
     - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
     - exe/gitlab-qa-report --generate-test-session "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASE_SESSIONS_PROJECT"
 
+relate_test_failures:
+  stage: report
+  rules:
+    - if: '$DISABLE_RELATING_FAILURE_ISSUES'
+      when: never
+    - if: '$TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == $TOP_UPSTREAM_DEFAULT_BRANCH'
+      when: always
+    - if: '$TOP_UPSTREAM_SOURCE_JOB =~ /\Ahttps:\/\/ops.gitlab.net\//'
+      when: always
+  variables:
+    QA_FAILURES_REPORTING_PROJECT: "gitlab-org/gitlab"
+    QA_FAILURES_MAX_DIFF_RATIO: "0.05"
+    # The --dry-run can be set to modify the behavior of `exe/gitlab-qa-report --relate-failure-issue` without releasing a new gem version.
+    QA_FAILURES_REPORTER_OPTIONS: ""
+  script:
+    - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN"
+    - exe/gitlab-qa-report --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_FAILURES_REPORTING_PROJECT" --max-diff-ratio "$QA_FAILURES_MAX_DIFF_RATIO" $QA_FAILURES_REPORTER_OPTIONS
+
 .notify_upstream_commit:
   stage: notify
   image: ruby:2.6
@@ -994,7 +1010,7 @@ notify_slack:
   rules:
     - if: '$TOP_UPSTREAM_SOURCE_JOB && $NOTIFY_CHANNEL'
       when: on_failure
-    - if: '$TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == "master"'
+    - if: '$TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == $TOP_UPSTREAM_DEFAULT_BRANCH'
       when: on_failure
   script:
     - export RELEASE=${TOP_UPSTREAM_SOURCE_REF:-$RELEASE}

data/lib/gitlab/qa.rb

@@ -57,6 +57,7 @@ module Gitlab
           autoload :SMTP, 'gitlab/qa/scenario/test/integration/smtp'
           autoload :GitalyCluster, 'gitlab/qa/scenario/test/integration/gitaly_cluster'
           autoload :Jira, 'gitlab/qa/scenario/test/integration/jira'
+          autoload :SSHTunnel, 'gitlab/qa/scenario/test/integration/ssh_tunnel'
         end
 
         module Sanity

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

@@ -27,7 +27,7 @@ module Gitlab
         # rubocop:enable Metrics/AbcSize
 
         def generate_description(tests)
-          <<~MARKDOWN
+          <<~MARKDOWN.rstrip
           ## Session summary
 
           * Deploy version: #{Runtime::Env.deploy_version}
@@ -39,9 +39,7 @@ module Gitlab
 
           #{generate_stages_listing(tests)}
 
-          ## Release QA issue
-
-          * #{Runtime::Env.qa_issue_url}
+          #{generate_qa_issue_relation}
           MARKDOWN
         end
 
@@ -229,6 +227,18 @@ module Gitlab
             '-'
           end
         end
+
+        def generate_qa_issue_relation
+          return unless Runtime::Env.qa_issue_url
+
+          <<~MARKDOWN.chomp
+          ## Release QA issue
+
+          * #{Runtime::Env.qa_issue_url}
+
+          /relate #{Runtime::Env.qa_issue_url}
+          MARKDOWN
+        end
       end
     end
   end

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

@@ -110,7 +110,7 @@ module Gitlab
           channel = pipeline == "canary" ? "qa-production" : "qa-#{pipeline}"
           error_msg = warn_exception(e)
 
-          return unless QA::Runtime::Env.ci_commit_ref_name == 'master'
+          return unless QA::Runtime::Env.ci_commit_ref_name == QA::Runtime::Env.default_branch
 
           slack_options = {
             channel: channel,

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

@@ -34,7 +34,10 @@ module Gitlab
               #  /qa/specs/features/ee/api/<stage>
               #  /qa/specs/features/ee/browser_ui/<stage>
               # For now we assume the Stage is whatever follows api/ or browser_ui/
-              stage = strip_number_prefix(test['file'].match(%r{(api|browser_ui)/([a-z0-9_]+)}i)[2])
+              test_path_match = test['file'].match(%r{(api|browser_ui)/([a-z0-9_]+)}i)
+              next unless test_path_match
+
+              stage = strip_number_prefix(test_path_match[2])
               testcases[stage] = [] unless testcases.key?(stage)
               testcases[stage] << test
             end

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

@@ -10,7 +10,7 @@ module Gitlab
       # Uses the API to create or update GitLab issues with the results of tests from RSpec report files.
       class RelateFailureIssue < ReportAsIssue
         DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION = 0.05
-        STACKTRACE_REGEX = %r{### Stack trace\s*(```)\s*.*(Failure/Error:.+)(\1)}m.freeze
+        STACKTRACE_REGEX = %r{### Stack trace\s*(```)\s*(?!.*Failure/Error:)?(.+)(\1)}m.freeze
         NEW_ISSUE_LABELS = Set.new(%w[QA Quality test failure::investigating priority::2]).freeze
 
         MultipleIssuesFound = Class.new(StandardError)
@@ -85,7 +85,8 @@ module Gitlab
             next unless relevant_issue_stacktrace
 
             distance = ld.call(first_test_failure_stacktrace, relevant_issue_stacktrace)
-            diff_ratio = (distance.to_f / first_test_failure_stacktrace.size).round(3)
+            diff_ratio = distance.zero? ? 0.0 : (distance.to_f / first_test_failure_stacktrace.size).round(3)
+
             if diff_ratio <= max_diff_ratio
               puts "  => [DEBUG] Issue #{issue} has an acceptable diff ratio of #{(diff_ratio * 100).round(2)}%."
               # The `Gitlab::ObjectifiedHash` class overrides `#hash` which is used by `Hash#[]=` to compute the hash key.

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

@@ -112,7 +112,7 @@ module Gitlab
             "found:#{pipeline}.gitlab.com"
           when 'preprod'
             'found:pre.gitlab.com'
-          when 'staging-orchestrated', 'nightly', 'master'
+          when 'staging-orchestrated', 'nightly', QA::Runtime::Env.default_branch
             "found:#{pipeline}"
           else
             raise "No `found:*` label for the `#{pipeline}` pipeline!"
@@ -147,14 +147,14 @@ module Gitlab
           # Gets the name of the pipeline the test was run in, to be used as the key of a scoped label
           #
           # Tests can be run in several pipelines:
-          #   gitlab-qa, nightly, master, staging, canary, production, preprod, and MRs
+          #   gitlab-qa, nightly, staging, canary, production, preprod, MRs, and the default branch (master/main)
           #
           # Some of those run in their own project, so CI_PROJECT_NAME is the name we need. Those are:
           #   nightly, staging, canary, production, and preprod
           #
-          # MR, master, and gitlab-qa tests run in gitlab-qa, but we only want to report tests run on master
-          # because the other pipelines will be monitored by the author of the MR that triggered them.
-          # So we assume that we're reporting a master pipeline if the project name is 'gitlab-qa'.
+          # MR, master/main, and gitlab-qa tests run in gitlab-qa, but we only want to report tests run on
+          # master/main because the other pipelines will be monitored by the author of the MR that triggered them.
+          # So we assume that we're reporting a master/main pipeline if the project name is 'gitlab-qa'.
 
           @pipeline ||= Runtime::Env.pipeline_from_project_name
         end

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

@@ -44,6 +44,7 @@ module Gitlab
           'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
           'QA_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
+          'QA_DEFAULT_BRANCH' => :qa_default_branch,
           'QA_LOG_PATH' => :qa_log_path,
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
@@ -100,6 +101,10 @@ module Gitlab
           end
         end
 
+        def default_branch
+          ENV['QA_DEFAULT_BRANCH'] || 'master'
+        end
+
         def gitlab_username
           ENV['GITLAB_USERNAME'] || 'gitlab-qa'
         end
@@ -157,7 +162,7 @@ module Gitlab
             if ENV['TOP_UPSTREAM_SOURCE_JOB'].to_s.start_with?('https://ops.gitlab.net')
               'staging-orchestrated'
             else
-              'master'
+              QA::Runtime::Env.default_branch
             end
           else
             ci_project_name
@@ -176,6 +181,10 @@ module Gitlab
           ENV['GITLAB_QA_DEV_ACCESS_TOKEN']
         end
 
+        def initial_root_password
+          ENV['GITLAB_INITIAL_ROOT_PASSWORD']
+        end
+
         def qa_container_registry_access_token
           ENV['GITLAB_QA_CONTAINER_REGISTRY_ACCESS_TOKEN']
         end
@@ -251,6 +260,25 @@ module Gitlab
           end
         end
 
+        def require_initial_password!
+          return unless ENV['GITLAB_INITIAL_ROOT_PASSWORD'].to_s.strip.empty?
+
+          raise ArgumentError, "Environment variable GITLAB_INITIAL_ROOT_PASSWORD must be provided to set an initial root password."
+        end
+
+        def require_ssh_tunnel!
+          %w[TUNNEL_SSH_PRIVATE_KEY TUNNEL_SERVER_HOSTNAME TUNNEL_SSH_USER].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run tunnel specs" unless ENV.key?(env_key)
+          end
+        end
+
+        def override_default_password!
+          require_initial_password!
+
+          ENV['GITLAB_PASSWORD'] = initial_root_password
+          ENV['GITLAB_ADMIN_PASSWORD'] = initial_root_password
+        end
+
         def skip_pull?
           enabled?(ENV['QA_SKIP_PULL'], default: false)
         end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      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!
+
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+
+                Component::InternetTunnel.perform do |tunnel_gitlab|
+                  Component::InternetTunnel.perform do |tunnel_registry|
+                    tunnel_gitlab.gitlab_hostname = gitlab.hostname
+                    tunnel_gitlab.network = 'test'
+                    tunnel_registry.gitlab_hostname = gitlab.hostname
+                    tunnel_registry.network = 'test'
+
+                    gitlab.omnibus_config = <<~OMNIBUS
+                      external_url '#{tunnel_gitlab.url}';
+                      nginx['listen_port'] = 80;
+                      nginx['listen_https'] = false;
+                      # documentation: https://docs.gitlab.com/omnibus/settings/database.html#seed-the-database-fresh-installs-only
+                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password}'
+
+                      registry_external_url '#{tunnel_registry.url}';
+                      registry_nginx['listen_port'] = 80;
+                      registry_nginx['listen_https'] = false;
+                    OMNIBUS
+
+                    tunnel_gitlab.instance do
+                      tunnel_registry.instance do
+                        gitlab.instance do
+                          Component::Specs.perform do |specs|
+                            specs.suite = 'Test::Integration::SSHTunnel'
+                            specs.release = gitlab.release
+                            specs.network = gitlab.network
+                            specs.args = [tunnel_gitlab.url, *rspec_args]
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            # rubocop:enable Metrics/AbcSize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.15.1'.freeze
+    VERSION = '6.17.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.15.1
+  version: 6.17.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -310,6 +310,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
 - lib/gitlab/qa/scenario/test/integration/saml.rb
 - lib/gitlab/qa/scenario/test/integration/smtp.rb
+- lib/gitlab/qa/scenario/test/integration/ssh_tunnel.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb