gitlab-qa 8.7.0 → 8.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a59adb2954b85b2adb1eddb1f0fbc568c01fa9d2d466a3a6c16fa4c5bb12e3b
-  data.tar.gz: c362d1e370e23f891e9a23a785ee88e48431fd466fd2aa1b38d2596f68ceeabf
+  metadata.gz: 0ffa49a5a85a5e660bb61689d01b0a7daa3a0004f7e05e5a9100dd83dbeeea55
+  data.tar.gz: 8f158219d4c59b3db6181534eafdd55e5ca2abbcae1a0402c4f80d3f8c77fa82
 SHA512:
-  metadata.gz: 4de67f7a4bc50f6a28503ea6bfaf988f1ca18db321dba31006eac49de6cf5159c981862909ed57cef6f61126fa1d429843a912f59445ebab270e104dd5f0f382
-  data.tar.gz: 956a7115f74b6b563289feb1e75cfcb0d4901c2b1bef1fd8480508c7197c2e0934f0dd812a3a3ced498a430ccad3eeabb49751d2253cc02955e34db358cd83d9
+  metadata.gz: 7cb6f4b7197625d3db353048368716a80e7bdf17e7060cfaadf90a13d44c96805c76e396b3fa78a6e777dacad191305c12ec78e8c9e8920d3a09100f7d2ebd56
+  data.tar.gz: cfec5285a2a0d54986d3984f333497082911febee8d3a368dc2be3f81d04753e2c8a726bd8515d1be62181a591077eb4c47555865e1fc331ace507289adc47a3

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

@@ -0,0 +1,22 @@
+ee:chaos:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Chaos"
+    QA_RSPEC_TAGS: "--tag chaos"
+
+ee:chaos-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Chaos"
+    QA_RSPEC_TAGS: "--tag quarantine --tag chaos"

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

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

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

@@ -4,7 +4,7 @@ ce:sanity-framework:
     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"
+    - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "1 failure"
   extends:
     - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
@@ -16,7 +16,7 @@ ee:sanity-framework:
     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"
+    - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "1 failure"
   extends:
     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test

data/.gitlab-ci.yml

@@ -100,6 +100,7 @@ generate-jobs:
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag repository_storage
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag packages
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag integrations
+    - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag gitlab_pages
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag mtls
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag jira
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag can_use_large_setup

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.7.0)
+    gitlab-qa (8.9.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
       nokogiri (~> 1.10)
-      rainbow (~> 3.0.0)
+      rainbow (>= 3, < 4)
       table_print (= 1.5.7)
-      zeitwerk (~> 2.4)
+      toxiproxy (~> 2.0.2)
+      zeitwerk (>= 2, < 3)
 
 GEM
   remote: https://rubygems.org/
@@ -216,6 +217,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)
     tilt (2.0.11)
+    toxiproxy (2.0.2)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)

data/bin/expect_exit_code_and_text

@@ -26,7 +26,7 @@ else
     if [ "$?" -eq "0" ]; then
       echo "'$SCRIPT' outputted '$EXPECTED_TEXT', as expected!"
     else
-      echo "'$SCRIPT' was expected to output '$EXPECTED_TEXT', but did not!"
+      echo "'$SCRIPT' was expected to match output '$EXPECTED_TEXT', but did not!"
       exit 1
     fi
   else

data/docs/release_process.md

@@ -34,4 +34,8 @@ Note: The `gem-release` job uses:
 - the `GITLAB_API_TOKEN` environment variable to authenticate against GitLab.com's API in order to create the tag
 - the `GEM_HOST_API_KEY` environment variable to authenticate against Rubygems.org's API in order to release the gem
 
+## Post-release maintenance
+
+Please note that `gitlab-qa` version in `gitlab-org/gitlab` project will be updated automatically by [renovate-gitlab-bot](https://gitlab.com/gitlab-org/frontend/renovate-gitlab-bot). However, for live environment pipelines we need to specify the version in `pipeline-common` project manually. Remember to open an MR updating `GITLAB_QA_VERSION` value in [base.gitlab-ci.yml](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/base.gitlab-ci.yml#L4) shortly after the new version is released.
+
 [`lib/gitlab/qa/version.rb`]: https://gitlab.com/gitlab-org/gitlab-qa/blob/master/lib/gitlab/qa/version.rb#L3

data/docs/what_tests_can_be_run.md

@@ -368,6 +368,22 @@ Example:
 $ gitlab-qa Test::Integration::GitalyCluster EE
 ```
 
+### `Test::Integration::GitlabPages CE|EE|<full image address>`
+
+This tests that a GitLab Instance works as expected with [GitLab Pages](https://docs.gitlab.com/ee/user/project/pages/) enabled.
+
+The scenario configures the instance by setting up these instructions [here](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/main/doc/howto/pages.md) through enabling `gitlab_pages['enable'] = true;`, setting up an external url and the adding of the GitLab Pages hostname and GitLab Instance IP into the `etc/hostfile` on the container that runs the specs so it can access the page on the GitLab container.
+
+To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Instance::All` scenario with the `:gitlab_pages` tag.
+
+Example:
+
+```
+$ gitlab-qa Test::Integration::GitlabPages EE
+```
+
 ### `Test::Integration::LDAPNoTLS CE|EE|<full image address>`
 
 This tests that a GitLab instance works as expected with an external
@@ -1035,6 +1051,33 @@ $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
 
 $ gitlab-qa Test::Instance::Geo EE https://primary.gitlab.com https://secondary.gitlab.com
 ```
+
+### `Test::Instance::Chaos`
+
+This scenario will run a limited number of tests that are tagged with `:chaos`.
+
+These tests are designed to verify that our systems can gracefully handle scenarios which may occur if 
+networking or connectivity type issues occur in various Gitlab components. 
+They make use of [toxiproxy(https://github.com/Shopify/toxiproxy)] to act as a proxy allowing us to introduce 
+connectivity issues, via the [toxiproxy ruby client](https://github.com/Shopify/toxiproxy-ruby) in an E2E spec. 
+
+Sample Test:
+
+```ruby
+  context 'when a gitaly node is experiencing high latency' do
+    it 'can create a project' do
+      Toxiproxy[:gitaly1].toxic(:latency, latency: 30000).apply do
+        expect(create_a_project).to be true
+      end
+    end
+  end
+```
+
+Example:
+
+```
+$ gitlab-qa Test::Instance::Chaos
+```
 ----
 
 [Back to README.md](../README.md)

data/gitlab-qa.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'gitlab', '~> 4.18.0'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
-  spec.add_runtime_dependency 'rainbow', '~> 3.0.0'
+  spec.add_runtime_dependency 'rainbow', '>= 3', '< 4'
   spec.add_runtime_dependency 'table_print', '1.5.7'
-  spec.add_runtime_dependency 'zeitwerk', '~> 2.4'
+  spec.add_runtime_dependency 'toxiproxy', '~> 2.0.2'
+  spec.add_runtime_dependency 'zeitwerk', '>= 2', '< 3'
 end

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

@@ -51,6 +51,10 @@ module Gitlab
           teardown unless skip_teardown
         end
 
+        def ip_address
+          docker.inspect(name) { |command| command << "-f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}'" }
+        end
+
         alias_method :launch_and_teardown_instance, :instance
 
         def prepare

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+require 'toxiproxy'
+
+module Gitlab
+  module QA
+    module Component
+      class Chaos < Base
+        DOCKER_IMAGE = 'ghcr.io/shopify/toxiproxy'
+        DOCKER_IMAGE_TAG = '2.5.0'
+
+        def initialize
+          super
+          @network = "test"
+        end
+
+        def name
+          @name ||= "chaos"
+        end
+
+        def start
+          prepare
+          docker.run(image: image, tag: tag) do |command|
+            command << '-d '
+            command << "--name #{name}"
+            command << "--network #{@network}"
+            command << "--publish 8474:8474"
+          end
+
+          Toxiproxy.host = "http://localhost:8474"
+
+          begin
+            attempts ||= 1
+            Toxiproxy.populate([
+                                 {
+                                   name: "postgres",
+                                   listen: "[::]:5432",
+                                   upstream: "postgres.test:5432",
+                                   "enabled": true
+                                 },
+                                 {
+                                   name: "praefect",
+                                   listen: "[::]:2305",
+                                   upstream: "praefect.test:2305",
+                                   "enabled": true
+                                 },
+                                 {
+                                   name: "gitaly1",
+                                   listen: "[::]:8076",
+                                   upstream: "gitaly1.test:8076",
+                                   "enabled": true
+                                 },
+                                 {
+                                   name: "gitaly2",
+                                   listen: "[::]:8077",
+                                   upstream: "gitaly2.test:8077",
+                                   "enabled": true
+                                 },
+                                 {
+                                   name: "gitaly3",
+                                   listen: "[::]:8078",
+                                   upstream: "gitaly3.test:8078",
+                                   "enabled": true
+                                 }
+                               ])
+          rescue StandardError => e
+            Runtime::Logger.warn e.message
+
+            # This should resolve within seconds, but give some leeway for the toxiproxy container to start
+            if (attempts += 1) < 10
+              Runtime::Logger.info "Waiting #{attempts} seconds before retrying setting toxiproxy config"
+              sleep attempts
+              retry
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/CyclomaticComplexity
 
 require 'securerandom'
 
@@ -10,12 +11,13 @@ module Gitlab
       # the `qa/` directory located in GitLab CE / EE repositories.
       #
       class Specs < Scenario::Template
-        attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network, :hostname
+        attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network, :hostname, :additional_hosts
 
         def initialize
           @docker = Docker::Engine.new(stream_output: true) # stream test output directly instead of through logger
           @env = {}
           @volumes = {}
+          @additional_hosts = []
           @default_volumes = { '/var/run/docker.sock' => '/var/run/docker.sock' }
           return if Runtime::Env.qa_knapsack_report_path.blank?
 
@@ -56,8 +58,8 @@ module Gitlab
                 command.env('QA_HOSTNAME', hostname)
               end
 
-              unless Runtime::Env.docker_add_hosts.empty?
-                hosts = Runtime::Env.docker_add_hosts.map { |host| "--add-host=#{host} " }.join
+              if Runtime::Env.docker_add_hosts.present? || additional_hosts.present?
+                hosts = Runtime::Env.docker_add_hosts.concat(additional_hosts).map { |host| "--add-host=#{host} " }.join
                 command << hosts # override /etc/hosts in docker container when test runs
               end
 
@@ -111,3 +113,4 @@ module Gitlab
     end
   end
 end
+# rubocop:enable Metrics/CyclomaticComplexity

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Chaos < Praefect
+            def initialize
+              super
+
+              @praefect_addr = "chaos.test"
+              @database_addr = "chaos.test"
+              @primary_node_addr = "chaos.test"
+              @primary_node_port = 8076
+              @secondary_node_addr = "chaos.test"
+              @secondary_node_port = 8077
+              @tertiary_node_addr = "chaos.test"
+              @tertiary_node_port = 8078
+            end
+
+            def perform(release, *rspec_args)
+              @chaos_node = Component::Chaos.new.tap(&:start)
+
+              run_gitaly_cluster(release, rspec_args)
+            ensure
+              @chaos_node&.teardown
+              @praefect_node&.teardown
+              @sql_node&.teardown
+              @gitaly_primary_node&.teardown
+              @gitaly_secondary_node&.teardown
+              @gitaly_tertiary_node&.teardown
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,13 +8,29 @@ module Gitlab
           class GitalyCluster < Scenario::Template
             attr_reader :gitlab_name, :spec_suite
 
-            def initialize
+            def initialize # rubocop:disable Metrics/AbcSize
               @gitlab_name = 'gitlab-gitaly-cluster'
+
               @primary_node_name = 'gitaly1'
+              @primary_node_addr = "#{@primary_node_name}.#{@network}"
+              @primary_node_port = 8075
+
               @secondary_node_name = 'gitaly2'
+              @secondary_node_addr = "#{@secondary_node_name}.#{@network}"
+              @secondary_node_port = 8075
+
               @tertiary_node_name = 'gitaly3'
+              @tertiary_node_addr = "#{@tertiary_node_name}.#{@network}"
+              @tertiary_node_port = 8075
+
               @praefect_node_name = 'praefect'
+              @praefect_port = 2305
+              @praefect_addr = "#{@praefect_node_name}.#{@network}"
+
               @database = 'postgres'
+              @database_port = 5432
+              @database_addr = "#{@database}.#{@network}"
+
               @spec_suite = 'Test::Instance::All'
               @network = 'test'
               @env = {}
@@ -22,6 +38,16 @@ module Gitlab
             end
 
             def perform(release, *rspec_args)
+              run_gitaly_cluster(release, rspec_args)
+            ensure
+              @praefect_node&.teardown
+              @sql_node&.teardown
+              @gitaly_primary_node&.teardown
+              @gitaly_secondary_node&.teardown
+              @gitaly_tertiary_node&.teardown
+            end
+
+            def run_gitaly_cluster(release, rspec_args) # rubocop:disable Metrics/AbcSize
               # The postgres container starts in seconds so not essential to parallelize it
               # This also ensure that the docker network is created here, avoiding any potential race conditions later
               #  if the gitaly-cluster and GitLab containers attempt to create a network in parallel
@@ -57,21 +83,15 @@ module Gitlab
                   end
                 end
               end
-            ensure
-              @praefect_node&.teardown
-              @sql_node&.teardown
-              @gitaly_primary_node&.teardown
-              @gitaly_secondary_node&.teardown
-              @gitaly_tertiary_node&.teardown
             end
 
             private
 
             def start_gitaly_cluster(release)
               Runtime::Logger.info("Starting Gitaly Cluster")
-              @gitaly_primary_node = gitaly(@primary_node_name, release)
-              @gitaly_secondary_node = gitaly(@secondary_node_name, release)
-              @gitaly_tertiary_node = gitaly(@tertiary_node_name, release)
+              @gitaly_primary_node = gitaly(@primary_node_name, @primary_node_port, release)
+              @gitaly_secondary_node = gitaly(@secondary_node_name, @secondary_node_port, release)
+              @gitaly_tertiary_node = gitaly(@tertiary_node_name, @tertiary_node_port, release)
 
               @praefect_node = praefect(@praefect_node_name, release)
               Runtime::Logger.info("Gitaly Cluster Ready")
@@ -97,31 +117,31 @@ module Gitlab
                 #{disable_other_services}
                 gitaly['enable'] = false;
                 praefect['enable'] = true;
-                praefect['listen_addr'] = '0.0.0.0:2305';
+                praefect['listen_addr'] = '0.0.0.0:#{@praefect_port}';
                 praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
                 praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
                 praefect['reconciliation_scheduling_interval'] = '10s';
-                praefect['database_host'] = '#{@database}.#{@network}';
+                praefect['database_host'] = '#{@database_addr}';
                 praefect['database_user'] = 'postgres';
-                praefect['database_port'] = 5432;
+                praefect['database_port'] = #{@database_port};
                 praefect['database_password'] = 'SQL_PASSWORD';
                 praefect['database_dbname'] = 'praefect_production';
                 praefect['database_sslmode'] = 'disable';
-                praefect['database_direct_host'] = '#{@database}.#{@network}';
-                praefect['database_direct_port'] = 5432;
+                praefect['database_direct_host'] = '#{@database_addr}';
+                praefect['database_direct_port'] = #{@database_port};
                 praefect['virtual_storages'] = {
                   'default' => {
                     'nodes' => {
                       '#{@primary_node_name}' => {
-                        'address' => 'tcp://#{@primary_node_name}.#{@network}:8075',
+                        'address' => 'tcp://#{@primary_node_addr}:#{@primary_node_port}',
                         'token'   => 'PRAEFECT_INTERNAL_TOKEN'
                       },
                       '#{@secondary_node_name}' => {
-                        'address' => 'tcp://#{@secondary_node_name}.#{@network}:8075',
+                        'address' => 'tcp://#{@secondary_node_addr}:#{@secondary_node_port}',
                         'token'   => 'PRAEFECT_INTERNAL_TOKEN'
                       },
                       '#{@tertiary_node_name}' => {
-                        'address' => 'tcp://#{@tertiary_node_name}.#{@network}:8075',
+                        'address' => 'tcp://#{@tertiary_node_addr}:#{@tertiary_node_port}',
                         'token'   => 'PRAEFECT_INTERNAL_TOKEN'
                       }
                     }
@@ -130,12 +150,12 @@ module Gitlab
               OMNIBUS
             end
 
-            def gitaly_omnibus_configuration
+            def gitaly_omnibus_configuration(listen_port)
               <<~OMNIBUS
                 #{disable_other_services.sub(/(prometheus\['enable'\]) = false/, '\1 = true')}
                 prometheus_monitoring['enable'] = false;
                 gitaly['enable'] = true;
-                gitaly['listen_addr'] = '0.0.0.0:8075';
+                gitaly['listen_addr'] = '0.0.0.0:#{listen_port}';
                 gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
                 gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
                 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
@@ -160,7 +180,7 @@ module Gitlab
 
                 git_data_dirs({
                   'default' => {
-                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_address' => 'tcp://#{@praefect_addr}:#{@praefect_port}',
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   }
                 });
@@ -171,7 +191,7 @@ module Gitlab
                     'job_name' => 'praefect',
                     'static_configs' => [
                       'targets' => [
-                        '#{@praefect_node_name}.#{@network}:9652'
+                        '#{@praefect_addr}:#{@praefect_port}'
                       ]
                     ]
                   },
@@ -215,14 +235,14 @@ module Gitlab
               end
             end
 
-            def gitaly(name, release)
+            def gitaly(name, port, release)
               Component::Gitlab.new.tap do |gitaly|
                 gitaly.release = QA::Release.new(release)
                 gitaly.name = name
                 gitaly.network = @network
                 gitaly.skip_availability_check = true
                 gitaly.seed_admin_token = false
-                gitaly.omnibus_configuration << gitaly_omnibus_configuration
+                gitaly.omnibus_configuration << gitaly_omnibus_configuration(port)
                 gitaly.instance(skip_teardown: true)
               end
             end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class GitlabPages < Scenario::Template
+            def initialize
+              @gitlab_name = 'gitlab-pages'
+              @network = 'test'
+              @pages_host = 'gitlab-pages.test'
+              @pages_sandbox_name = 'gitlab-qa-sandbox-group-pages'
+              @tag = 'gitlab_pages'
+            end
+
+            def gitlab_omnibus_configuration
+              <<~OMNIBUS
+                  pages_external_url 'http://#{@gitlab_name}.#{@network}';
+                  gitlab_pages['enable'] = true;
+              OMNIBUS
+            end
+
+            def set_sandbox_name(sandbox_name)
+              ::Gitlab::QA::Runtime::Env.gitlab_sandbox_name = sandbox_name
+            end
+
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = QA::Release.new(release)
+                gitlab.name = @gitlab_name
+                gitlab.network = @network
+
+                set_sandbox_name(@pages_sandbox_name)
+
+                gitlab.omnibus_configuration << gitlab_omnibus_configuration
+                gitlab.instance do
+                  if @tag
+                    rspec_args << "--" unless rspec_args.include?('--')
+                    rspec_args << "--tag" << @tag
+                  end
+
+                  Component::Specs.perform do |specs|
+                    specs.additional_hosts << "#{@pages_sandbox_name}.#{@pages_host}:#{gitlab.ip_address}"
+                    specs.suite = 'Test::Instance::All'
+                    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/scenario/test/integration/praefect.rb

@@ -21,7 +21,7 @@ module Gitlab
 
                 git_data_dirs({
                   'default' => {
-                    'gitaly_address' => 'tcp://#{@praefect_node_name}.#{@network}:2305',
+                    'gitaly_address' => 'tcp://#{@praefect_addr}:#{@praefect_port}',
                     'gitaly_token' => 'PRAEFECT_EXTERNAL_TOKEN'
                   },
                   'gitaly' => {
@@ -45,7 +45,7 @@ module Gitlab
                     'job_name' => 'praefect',
                     'static_configs' => [
                       'targets' => [
-                        '#{@praefect_node_name}.#{@network}:9652'
+                        '#{@praefect_addr}:9652'
                       ]
                     ]
                   },
@@ -53,9 +53,9 @@ module Gitlab
                     'job_name' => 'praefect-gitaly',
                     'static_configs' => [
                       'targets' => [
-                        '#{@primary_node_name}.#{@network}:9236',
-                        '#{@secondary_node_name}.#{@network}:9236',
-                        '#{@tertiary_node_name}.#{@network}:9236'
+                        '#{@primary_node_addr}:9236',
+                        '#{@secondary_node_addr}:9236',
+                        '#{@tertiary_node_addr}:9236'
                       ]
                     ]
                   }

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.7.0'
+    VERSION = '8.9.0'
   end
 end

data/scripts/generate-qa-jobs.rb

@@ -40,6 +40,7 @@ class GenerateQAJobs
     jobs.merge!(load_yml_contents('opensearch', should_automatically_run?('test_integration_opensearch')))
     jobs.merge!(load_yml_contents('praefect', should_automatically_run?('test_instance_all')))
     jobs.merge!(load_yml_contents('gitaly_cluster', should_automatically_run?('test_instance_all')))
+    jobs.merge!(load_yml_contents('gitlab_pages', should_automatically_run?('test_instance_all_gitlab_pages')))
     jobs.merge!(load_yml_contents('mtls', should_automatically_run?('test_instance_all_mtls')))
     jobs.merge!(load_yml_contents('smtp', should_automatically_run?('test_integration_smtp')))
     jobs.merge!(load_yml_contents('jira', should_automatically_run?('test_instance_all_jira')))
@@ -47,6 +48,7 @@ class GenerateQAJobs
     jobs.merge!(load_yml_contents('large_setup', should_automatically_run?('test_instance_all_can_use_large_setup')))
     jobs.merge!(load_yml_contents('cloud_activation', should_automatically_run?('test_instance_all_cloud_activation')))
     jobs.merge!(load_yml_contents('registry_with_cdn', should_automatically_run?('test_integration_registrywithcdn')))
+    jobs.merge!(load_yml_contents('chaos', should_automatically_run?('test_integration_chaos')))
     jobs.merge!(load_yml_contents('staging'))
     jobs.merge!(load_yml_contents('metrics', should_automatically_run?('test_instance_all_metrics')))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.7.0
+  version: 8.9.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -182,16 +182,22 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -207,19 +213,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.7
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: toxiproxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: 
 email:
 - gitlab-qa@gmail.com
@@ -233,6 +259,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/ci/jobs/base.gitlab-ci.yml"
+- ".gitlab/ci/jobs/chaos.gitlab-ci.yml"
 - ".gitlab/ci/jobs/cloud_activation.gitlab-ci.yml"
 - ".gitlab/ci/jobs/custom_parallel.gitlab-ci.yml"
 - ".gitlab/ci/jobs/decomposition_multiple_db.gitlab-ci.yml"
@@ -241,6 +268,7 @@ files:
 - ".gitlab/ci/jobs/elasticsearch.gitlab-ci.yml"
 - ".gitlab/ci/jobs/geo.gitlab-ci.yml"
 - ".gitlab/ci/jobs/gitaly_cluster.gitlab-ci.yml"
+- ".gitlab/ci/jobs/gitlab_pages.gitlab-ci.yml"
 - ".gitlab/ci/jobs/group_saml.gitlab-ci.yml"
 - ".gitlab/ci/jobs/instance.gitlab-ci.yml"
 - ".gitlab/ci/jobs/instance_saml.gitlab-ci.yml"
@@ -311,6 +339,7 @@ files:
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
 - lib/gitlab/qa/component/base.rb
+- lib/gitlab/qa/component/chaos.rb
 - lib/gitlab/qa/component/elasticsearch.rb
 - lib/gitlab/qa/component/gitlab.rb
 - lib/gitlab/qa/component/jira.rb
@@ -383,10 +412,12 @@ files:
 - lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb
+- lib/gitlab/qa/scenario/test/integration/chaos.rb
 - lib/gitlab/qa/scenario/test/integration/client_ssl.rb
 - lib/gitlab/qa/scenario/test/integration/elasticsearch.rb
 - lib/gitlab/qa/scenario/test/integration/geo.rb
 - lib/gitlab/qa/scenario/test/integration/gitaly_cluster.rb
+- lib/gitlab/qa/scenario/test/integration/gitlab_pages.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/integrations.rb