gitlab-qa 6.16.0 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12907bedff5302d7716d94e3e9cdc5629a03feeccbab102bc3feabf477240355
-  data.tar.gz: 224a6d60f40826634d06abc1ebcccaff688fc4e38bf3d6f8a8ab253f289daaaa
+  metadata.gz: fc3ae23427dadce6649bb30dbc58dada153af79f60efb265edd5f7439facc56f
+  data.tar.gz: 9308ba475631df203f08503929787c1015fb4313b455d30a8fee2175016b1429
 SHA512:
-  metadata.gz: c657c2f07960e1d27e0c0db79730941586ecbe5b5a46b5a66b7059524f200f7b51fa40c1b01083b56649b4791462974da1dc5b1865282897c3a3b62892ad73f7
-  data.tar.gz: c16b9320f6b6b388754acdf70e532414fcd1344739aad13f5a64cee2905c9d2c3af79796ac5a3756581cf02d6da893eb560dbe9c682d3c655dba0871c592be7d
+  metadata.gz: 89c9c13ae10ff6e8f0076fb02d365cb45ede7320901bc5b4e4ca25ae935b9af26bc7da4d48bdab172ea6c3b74092032e5c9c5f04704ee7f98b38b67a594f81e5
+  data.tar.gz: 246f02d2389dd6db83ee1aac5e7dbc3e95ebfb12f9524f11181decf68ec5c9906adaa88531da62f66c2037c800de86084e4741193c3eaced1229ce135610fb1b

data/.gitlab-ci.yml

@@ -42,9 +42,6 @@ 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"
@@ -82,7 +79,6 @@ rspec:
     - 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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$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
     - exit $test_run_exit_code
 
 .ce-qa:
@@ -337,7 +333,6 @@ ce:update:
     - 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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$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
     - exit $test_run_exit_code
   extends:
     - .test
@@ -352,7 +347,6 @@ ce:update-quarantine:
     - 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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$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
     - exit $test_run_exit_code
   extends:
     - .test
@@ -366,7 +360,6 @@ ee:update:
     - 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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$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
     - exit $test_run_exit_code
   extends:
     - .test
@@ -381,7 +374,6 @@ ee:update-quarantine:
     - 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
-    - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$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
     - exit $test_run_exit_code
   extends:
     - .test
@@ -469,22 +461,23 @@ ee:mattermost-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
-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"
+# 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:
@@ -963,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

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/runtime/env.rb

@@ -181,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
@@ -256,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.16.0'.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.16.0
+  version: 6.17.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 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