gitlab-qa 7.3.1 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a314d23803f87dbaae80b80dc127fd6c285acf540f48d3feb8dd78038d4d1d
-  data.tar.gz: 49e24a262489cbd18e7105af26847e3ac4deec62c1d06a64191c65f86d9176f4
+  metadata.gz: b1a1313f56de2ef2b59bdaccf1bc7d035d6bffd01c5d5d2ddaca7365293017c9
+  data.tar.gz: 3fd92bbd855ab71f59f48e605eb9aa9385fe9173113b85c83a8d592ec28fb0b9
 SHA512:
-  metadata.gz: 4de75cf6f4fdee481c2b0b8d4c38d11d79e86fda4ac0eb00620efa525a7fe87f03c1c1cd338c52edcb05e133a2dc52a884b5e45a9c64395c7707f8d6e49d89eb
-  data.tar.gz: 92361b1e9c8044c79beb7952bf71a54194a3071eec3883648d963de74f73efbc316f1daf23125821299772356d54d99d301c5838d6b4bc6253cdfeaf375917ca
+  metadata.gz: 577ede9a1cb24fb98710686ede8c7da92fe7a2e357aa6094bd6ddcdb6a6418660a5983f926a470dc367ad41655466bab93522e22721dae757f26fada187ad6ea
+  data.tar.gz: db1ac78a81bd21165d5f34c81970dd9c02025c522876d39590b24e807d87833482e0c5cee4ea13a6106bde12f797132aaaf3a4c8179b8fc2741815e82acbbded

data/.gitlab-ci.yml

@@ -44,6 +44,7 @@ variables:
   QA_ARTIFACTS_DIR: $CI_PROJECT_DIR
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
+  QA_GENERATE_ALLURE_REPORT: "true"
   QA_TESTCASES_REPORTING_PROJECT: "gitlab-org/quality/testcases"
   QA_TESTCASE_SESSIONS_PROJECT: "gitlab-org/quality/testcase-sessions"
   # QA_DEFAULT_BRANCH is the default branch name of the instance under test.
@@ -153,7 +154,10 @@ rspec:
   variables:
     QA_RSPEC_TAGS: "--tag quarantine"
 
+# Do not generate allure report since it always adds a failed test to the report. The job runs a test where 1 example would always fail and assert exit code via custom script bin/expect_exit_code_and_text
 ce:sanity-framework:
+  variables:
+    QA_GENERATE_ALLURE_REPORT: "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:
@@ -162,6 +166,8 @@ ce:sanity-framework:
     - .ce-qa
 
 ee:sanity-framework:
+  variables:
+    QA_GENERATE_ALLURE_REPORT: "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:
@@ -634,57 +640,16 @@ ee:group_saml-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::GroupSAML"
 
-ce:kubernetes:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .rspec-report-opts
-  allow_failure: true
-  variables:
-    QA_SCENARIO: "Test::Integration::Kubernetes"
-
-ce:kubernetes-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Kubernetes"
-
-ee:kubernetes:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .rspec-report-opts
-  allow_failure: true
-  variables:
-    QA_SCENARIO: "Test::Integration::Kubernetes"
-
-ee:kubernetes-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ee-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Kubernetes"
-
-ce:ssh_tunnel:
+ce:object_storage:
   extends:
     - .test
     - .high-capacity
     - .ce-qa
     - .rspec-report-opts
-  allow_failure: true
   variables:
-    QA_SCENARIO: "Test::Integration::SSHTunnel"
+    GITLAB_QA_OPTS: "--omnibus-config object_storage"
 
-ce:ssh_tunnel-quarantine:
+ce:object_storage-quarantine:
   extends:
     - .test
     - .high-capacity
@@ -692,19 +657,19 @@ ce:ssh_tunnel-quarantine:
     - .quarantine
     - .rspec-report-opts
   variables:
-    QA_SCENARIO: "Test::Integration::SSHTunnel"
+    GITLAB_QA_OPTS: "--omnibus-config object_storage"
 
-ee:ssh_tunnel:
+ee:object_storage_aws:
   extends:
     - .test
     - .high-capacity
     - .ee-qa
     - .rspec-report-opts
-  allow_failure: true
   variables:
-    QA_SCENARIO: "Test::Integration::SSHTunnel"
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_aws"
+    QA_RSPEC_TAGS: "--tag object_storage"
 
-ee:ssh_tunnel-quarantine:
+ee:object_storage_aws-quarantine:
   extends:
     - .test
     - .high-capacity
@@ -712,26 +677,8 @@ ee:ssh_tunnel-quarantine:
     - .quarantine
     - .rspec-report-opts
   variables:
-    QA_SCENARIO: "Test::Integration::SSHTunnel"
-
-ce:object_storage:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .rspec-report-opts
-  variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
-
-ce:object_storage-quarantine:
-  extends:
-    - .test
-    - .high-capacity
-    - .ce-qa
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    GITLAB_QA_OPTS: "--omnibus-config object_storage"
+    GITLAB_QA_OPTS: "--omnibus-config object_storage_aws"
+    QA_RSPEC_TAGS: "--tag quarantine --tag object_storage"
 
 ee:object_storage:
   extends:
@@ -1030,6 +977,24 @@ ee:jira-quarantine:
   variables:
     QA_SCENARIO: "Test::Integration::Jira"
 
+ce:large-setup:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag can_use_large_setup"
+
+ee:large-setup:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag can_use_large_setup"
+
 # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
 # variable to be passed when triggered.
 staging:
@@ -1126,3 +1091,37 @@ notify_slack:
 include:
   - project: 'gitlab-org/quality/pipeline-common'
     file: '/ci/gem-release.yml'
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/allure-report.yml'
+
+generate-allure-report:
+  extends: .generate-allure-report-base
+  stage: report
+  variables:
+    STORAGE_CREDENTIALS: $QA_ALLURE_REPORT_GCS_CREDENTIALS
+    GITLAB_AUTH_TOKEN: $GITLAB_QA_MR_ALLURE_REPORT_TOKEN
+    ALLURE_RESULTS_GLOB: gitlab-qa-run-*/**/allure-results/*
+    # Override allure variables for upstream triggers
+    ALLURE_PROJECT_PATH: $TOP_UPSTREAM_SOURCE_PROJECT
+    ALLURE_MERGE_REQUEST_IID: $TOP_UPSTREAM_MERGE_REQUEST_IID
+    ALLURE_COMMIT_SHA: $TOP_UPSTREAM_SOURCE_SHA
+  # Override default before script and don't push cache
+  cache:
+    policy: pull
+  before_script:
+    - echo "Generating and publishing allure test report"
+  rules:
+    # Don't run report generation on release pipelines
+    - 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'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
+      variables:
+        ALLURE_JOB_NAME: gitlab-qa
+      when: always
+    - if: '$TOP_UPSTREAM_SOURCE_PROJECT && $TOP_UPSTREAM_SOURCE_SHA'
+      variables:
+        ALLURE_JOB_NAME: package-and-qa
+      when: always

data/bin/notify_upstream_commit

@@ -3,10 +3,17 @@
 
 require 'gitlab'
 
+# Default to "Multi-pipeline (from 'gitlab-org/gitlab-qa' 'notify_upstream_commit:*' 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 = ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
+  config.private_token = api_token
 end
 
 class CommitComment

data/docs/run_qa_against_gdk.md

@@ -37,18 +37,18 @@ make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
   # build the QA image first
   # In gdk/gitlab:
   $ docker build -t gitlab/gitlab-ce-qa:your-custom-tag --file ./qa/Dockerfile ./
-  
-  # Note: You will also need a corresponding GitLab image. 
+
+  # Note: You will also need a corresponding GitLab image.
   # For example, if you haven't changed any application code (e.g., no new elements), you could tag the current nightly build:
   $ docker tag gitlab/gitlab-ce:nightly gitlab/gitlab-ce:your-custom-tag
 
   # Then in gitlab-qa:
   $ exe/gitlab-qa Test::Instance::Any gitlab/gitlab-ce:your-custom-tag http://192.168.0.12:3000 -- qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
   ```
-  
+
 **Note:** The hostname of the URL provided to `gitlab-qa` must match the hostname configured for GDK.
 If they do not match, a test will be signed out when it visits a page directly because the hostname of the URL visited will be different from the hostname that was used when signing in.
-  
+
 ### Running EE tests
 
 When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee).
@@ -68,7 +68,7 @@ Run from the `gdk-ee/gitlab/qa` directory with GDK primary and secondary running
 $ bundle exec bin/qa QA::EE::Scenario::Test::Geo --primary-address http://localhost:3001 --secondary-address http://localhost:3002 --primary-name primary --secondary-name secondary --without-setup
 
 # Run in visible Chrome browser
-$ CHROME_HEADLESS=0 bundle exec bin/qa QA::EE::Scenario::Test::Geo --primary-address http://localhost:3001 --secondary-address http://localhost:3002 --primary-name primary --secondary-name secondary --without-setup
+$ WEBDRIVER_HEADLESS=0 bundle exec bin/qa QA::EE::Scenario::Test::Geo --primary-address http://localhost:3001 --secondary-address http://localhost:3002 --primary-name primary --secondary-name secondary --without-setup
 ```
 
 ### QA Tool support on macOS

data/docs/what_tests_can_be_run.md

@@ -59,7 +59,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `EE_LICENSE` |-  | Enterprise Edition license. | No|
 | `QA_ARTIFACTS_DIR` |`/tmp/gitlab-qa`| Path to a directory where artifacts (logs and screenshots) for failing tests will be saved. | No|
 | `DOCKER_HOST` |`http://localhost`| Docker host to run tests against. | No|
-| `CHROME_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
+| `WEBDRIVER_HEADLESS` |-  | When running locally, set to `false` to allow Chrome tests to be visible - watch your tests being run. | No|
 | `QA_ADDITIONAL_REPOSITORY_STORAGE` |-  | The name of additional, non-default storage to be used with tests tagged `repository_storage`, run via the `Test::Instance::RepositoryStorage` scenario.  Note: Admin access is required to change repository storage. | No|
 | `QA_PRAEFECT_REPOSITORY_STORAGE` |-  | The name of repository storage using Praefect. Note: Admin access is required to change repository storage. | No|
 | `QA_COOKIES` |-  | Optionally set to "cookie1=value;cookie2=value" in order to add a cookie to every request. This can be used to set the canary cookie by setting it to "gitlab_canary=true". | No|
@@ -813,6 +813,15 @@ $ export EE_LICENSE=$(cat /path/to/gitlab_license)
 $ gitlab-qa Test::Instance::Airgapped EE -- --tag smoke
 ```
 
+### `Test::Instance::Image CE|EE|<full image address> --omnibus-config object_storage`
+
+This orchestrated scenario runs tests from the test suite against a GitLab instance which has object storage configured instead of using local storage. The omnibus configuration `object_storage` ([configurator](configuring_omnibus.md)), uses Minio and `object_storage_aws` uses an AWS S3 account with credentials configured in the pipeline as CI Variables (available on 1Password). Requires:
+
+* `AWS_S3_REGION` - Region where the bucket is created. To optimize latency, minimize costs, or address regulatory requirements, choose any AWS Region that is geographically close to you.
+* `AWS_S3_KEY_ID` - Key ID for the user accessing the bucket.
+* `AWS_S3_ACCESS_KEY` - Access Key for the user accessing the bucket.
+* `AWS_S3_BUCKET_NAME` - The name of the bucket where objects are stored. After a bucket is created, the name of that bucket cannot be used by another AWS account in any AWS Region until the bucket is deleted.
+
 ### `Test::Instance::Geo EE|<full image address>:nightly|latest|any_tag http://geo-primary.gitlab http://geo-secondary.gitlab`
 
 This scenario will run tests tagged `:geo` against a live Geo deployment, by spinning up a GitLab QA (`gitlab/gitlab-qa`)

data/gitlab-qa.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   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 'gitlab', '~> 4.16.1'

data/lib/gitlab/qa.rb

@@ -14,6 +14,7 @@ module Gitlab
         autoload :Default, 'gitlab/qa/runtime/omnibus_configurations/default'
         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 :LicenseMode, 'gitlab/qa/runtime/omnibus_configurations/license_mode'
       end
     end
@@ -66,6 +67,7 @@ module Gitlab
           autoload :SSHTunnel, 'gitlab/qa/scenario/test/integration/ssh_tunnel'
           autoload :MTLS, 'gitlab/qa/scenario/test/integration/mtls'
           autoload :ClientSSL, 'gitlab/qa/scenario/test/integration/client_ssl'
+          autoload :Registry, 'gitlab/qa/scenario/test/integration/registry'
         end
 
         module Sanity

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

@@ -92,7 +92,12 @@ module Gitlab
           'DEPLOY_VERSION' => :deploy_version,
           'GITLAB_QA_USER_AGENT' => :gitlab_qa_user_agent,
           'GEO_FAILOVER' => :geo_failover,
-          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password
+          'GITLAB_INITIAL_ROOT_PASSWORD' => :initial_root_password,
+          'GITLAB_TLS_CERTIFICATE' => :gitlab_tls_certificate,
+          '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
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -107,7 +112,7 @@ module Gitlab
         end
 
         def default_branch
-          ENV['QA_DEFAULT_BRANCH'] || 'master'
+          ENV['QA_DEFAULT_BRANCH'] || 'main'
         end
 
         def gitlab_availability_timeout
@@ -126,10 +131,6 @@ module Gitlab
           ENV['GITLAB_API_BASE'] || 'https://gitlab.com/api/v4'
         end
 
-        def gitlab_bot_multi_project_pipeline_polling_token
-          ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
-        end
-
         def gitlab_ci_api_token
           ENV['GITLAB_CI_API_TOKEN']
         end
@@ -214,6 +215,22 @@ module Gitlab
           ENV['ELASTIC_VERSION'] || '6.4.2'.freeze
         end
 
+        def aws_s3_region
+          ENV['AWS_S3_REGION']
+        end
+
+        def aws_s3_key_id
+          ENV['AWS_S3_KEY_ID']
+        end
+
+        def aws_s3_access_key
+          ENV['AWS_S3_ACCESS_KEY']
+        end
+
+        def aws_s3_bucket_name
+          ENV['AWS_S3_BUCKET_NAME']
+        end
+
         def variables
           vars = {}
 
@@ -269,6 +286,12 @@ module Gitlab
           end
         end
 
+        def require_aws_s3_environment!
+          %w[AWS_S3_REGION AWS_S3_KEY_ID AWS_S3_ACCESS_KEY AWS_S3_BUCKET_NAME].each do |env_key|
+            raise ArgumentError, "Environment variable #{env_key} must be set to run AWS S3 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_aws.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Runtime
+      module OmnibusConfigurations
+        class ObjectStorageAws < Default
+          def configuration
+            Runtime::Env.require_aws_s3_environment!
+
+            <<~OMNIBUS
+              gitlab_rails['object_store']['enabled'] = true
+              gitlab_rails['object_store']['proxy_download'] = true
+              gitlab_rails['object_store']['connection'] = { 'provider' => 'AWS', 'region' => '#{Runtime::Env.aws_s3_region}', 'aws_access_key_id' => '#{Runtime::Env.aws_s3_key_id}', 'aws_secret_access_key' => '#{Runtime::Env.aws_s3_access_key}' }
+
+              gitlab_rails['object_store']['objects']['artifacts']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['lfs']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['uploads']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['packages']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['pages']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+              gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = '#{Runtime::Env.aws_s3_bucket_name}'
+            OMNIBUS
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -12,8 +12,8 @@ module Gitlab
               @commands = <<~AIRGAP_AND_VERIFY_COMMAND.split(/\n+/)
                 # Should not fail before airgapping due to eg. DNS failure
                 # Ping and wget check
-                apt-get update && apt-get install -y iptables netcat
-                nc -zv -w 10 #{gitlab_ip} 80 && (echo \"Regular connectivity netcat check passed.\" && exit 0) || (echo \"Regular connectivity netcat check failed.\" && exit 1)
+                apt-get update && apt-get install -y iptables nmap
+                nmap -sT #{gitlab_ip} -p 80 && (echo \"Regular connectivity nmap check passed.\" && exit 0) || (echo \"Regular connectivity nmap check failed.\" && exit 1)
                 echo "Checking regular connectivity..." \
                   && wget --retry-connrefused --waitretry=1 --read-timeout=15 --timeout=10 -t 2 http://registry.gitlab.com > /dev/null 2>&1 \
                   && (echo "Regular connectivity wget check passed." && exit 0) || (echo "Regular connectivity wget check failed." && exit 1)
@@ -32,9 +32,9 @@ module Gitlab
                 iptables -A INPUT -p tcp -m tcp --dport 80 -m state --state NEW,ESTABLISHED -j ACCEPT
 
                 # Should now fail to ping and wget, port 80 should be open
-                nc -zv -w 10 #{gitlab_ip} 80 && (echo \"Airgapped network faulty. Connectivity netcat check failed.\" && exit 1) || (echo \"Connectivity netcat check passed.\" && exit 0)
-                nc -zv -w 10 127.0.0.1 22 && (echo "Airgapped connectivity port 22 check passed." && exit 0) || (echo "Airgapped connectivity port 22 check failed." && exit 1)
-                nc -zv -w 10 127.0.0.1 80 && (echo "Airgapped connectivity port 80 check passed." && exit 0) || (echo "Airgapped connectivity port 80 check failed." && exit 1)
+                nmap -sT #{gitlab_ip} -p 80 && (echo \"Airgapped network faulty. Connectivity nmap check failed.\" && exit 1) || (echo \"Connectivity nmap check passed.\" && exit 0)
+                nmap -sT  127.0.0.1 -p 22 && (echo "Airgapped connectivity port 22 check passed." && exit 0) || (echo "Airgapped connectivity port 22 check failed." && exit 1)
+                nmap -sT 10 127.0.0.1 -p 80 && (echo "Airgapped connectivity port 80 check passed." && exit 0) || (echo "Airgapped connectivity port 80 check failed." && exit 1)
                 echo "Checking airgapped connectivity..." \
                   && wget --retry-connrefused --waitretry=1 --read-timeout=15 --timeout=10 -t 2 http://registry.gitlab.com > /dev/null 2>&1 \
                   && (echo "Airgapped network faulty. Connectivity wget check failed." && exit 1) || (echo "Airgapped network confirmed. Connectivity wget check passed." && exit 0)

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

@@ -107,23 +107,24 @@ module Gitlab
                 praefect['database_password'] = 'SQL_PASSWORD';
                 praefect['database_dbname'] = 'praefect_production';
                 praefect['database_sslmode'] = 'disable';
-                praefect['postgres_queue_enabled'] = true;
-                praefect['failover_enabled'] = true;
+                praefect['database_host_no_proxy'] = '#{@database}.#{@network}';
+                praefect['database_port_no_proxy'] = 5432;
                 praefect['failover_election_strategy'] = 'per_repository';
                 praefect['virtual_storages'] = {
                   'default' => {
-                    '#{@primary_node_name}' => {
-                      'address' => 'tcp://#{@primary_node_name}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN',
-                      'primary' => true
-                    },
-                    '#{@secondary_node_name}' => {
-                      'address' => 'tcp://#{@secondary_node_name}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    },
-                    '#{@tertiary_node_name}' => {
-                      'address' => 'tcp://#{@tertiary_node_name}.#{@network}:8075',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                    'nodes' => {
+                      '#{@primary_node_name}' => {
+                        'address' => 'tcp://#{@primary_node_name}.#{@network}:8075',
+                        'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                      },
+                      '#{@secondary_node_name}' => {
+                        'address' => 'tcp://#{@secondary_node_name}.#{@network}:8075',
+                        'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                      },
+                      '#{@tertiary_node_name}' => {
+                        'address' => 'tcp://#{@tertiary_node_name}.#{@network}:8075',
+                        'token'   => 'PRAEFECT_INTERNAL_TOKEN'
+                      }
                     }
                   }
                 };
@@ -164,7 +165,7 @@ module Gitlab
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
                 });
-                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitaly['enable'] = false;
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
                 prometheus['scrape_configs'] = [
                   {

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

@@ -27,6 +27,7 @@ module Gitlab
                     'path' => '/var/opt/gitlab/git-data'
                   }
                 });
+                gitaly['enable'] = true;
                 gitaly['listen_addr'] = '0.0.0.0:8075';
                 gitaly['auth_token'] = 'secret-token';
                 gitaly['storage'] = [

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Registry < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+                gitlab.name = 'gitlab'
+                gitlab.tls = true
+
+                gitlab.omnibus_configuration << <<~OMNIBUS
+                  external_url 'https://#{gitlab.name}.#{gitlab.network}';
+                  registry_external_url 'https://#{gitlab.name}.#{gitlab.network}:5050';
+
+                  letsencrypt['enable'] = false;
+
+                  nginx['redirect_http_to_https'] = true;
+                  nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
+                  nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
+                  registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/gitlab.test.crt";
+                  registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab.test.key";
+                OMNIBUS
+
+                gitlab.instance do
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::Registry'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, *rspec_args]
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.3.1'.freeze
+    VERSION = '7.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.7.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.36'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/default.rb
 - 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/packages.rb
 - lib/gitlab/qa/runtime/scenario.rb
 - lib/gitlab/qa/runtime/token_finder.rb
@@ -314,6 +329,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
 - lib/gitlab/qa/scenario/test/integration/mtls.rb
 - lib/gitlab/qa/scenario/test/integration/praefect.rb
+- lib/gitlab/qa/scenario/test/integration/registry.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
@@ -355,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab