gitlab-qa 8.8.0 → 8.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89c4046779c498fad14fac05a4cc8ab68deb9d4ccb62e8eabaaace6af8be17d
-  data.tar.gz: a0c72ba4f7278b82f59678133578e11f23cb7e39449a82c21ec7beb967a524cc
+  metadata.gz: f953400de439363c7574e32bc75e4dfe90a51223708bb57c38c268e591b57bc8
+  data.tar.gz: fa43874f0bfd3e8524ab496bf44ea21b67dd42a8cecc532a6d020050603c3a2a
 SHA512:
-  metadata.gz: 7847ac077692217f68224ca9fdd31bcdadb833aa4aca0ab16113caf1efe6e1013689bca536d2b4c2b5fb3cd5d6e77a58f36b31e2b7c62d00f49abc66c2d0e683
-  data.tar.gz: 97e98ce591bb8a7cc2a804b1d1326605df8f68e0561cff27e235ddc48420be385794d8dd02ce635adafabd443b1e3f8ab9f4e4d194949b0fb91aedc06e243f32
+  metadata.gz: fc7a630d56deab744601fe176c17c52fdec1073701b990118eb7a11068e44faa65f068de470b1c340b8bca9fd4fc2d61fa82f980be84f8fd4c6c405799bfefe7
+  data.tar.gz: c5638a094566d7b27cf24a0d6ec4a7eebfcee7c8e26df7c5ea32d86a3944b3d6b59ec9f4ce768c20206bb743b8a6bd477521e6d4832f97fa005cd193fb23b43b

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.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,27 +1,26 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.8.0)
+    gitlab-qa (8.10.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)
       nokogiri (~> 1.10)
       rainbow (>= 3, < 4)
       table_print (= 1.5.7)
-      toxiproxy (~> 2.0.2)
       zeitwerk (>= 2, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
     benchmark (0.2.0)
@@ -38,7 +37,7 @@ GEM
       colored2 (~> 3.1)
     crack (0.4.5)
       rexml
-    danger (8.6.1)
+    danger (9.0.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -49,7 +48,7 @@ GEM
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 4.7)
+      octokit (~> 5.0)
       terminal-table (>= 1, < 4)
     danger-gitlab (8.0.0)
       danger
@@ -58,7 +57,7 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
-    faraday (1.10.0)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -73,7 +72,7 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.4.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
@@ -87,7 +86,8 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    git (1.11.0)
+    git (1.12.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     gitlab (4.18.0)
       httparty (~> 0.18)
@@ -128,47 +128,47 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.25.1)
+    octokit (5.6.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     racc (1.6.0)
-    rack (2.2.4)
-    rainbow (3.0.0)
+    rack (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -178,7 +178,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
@@ -197,7 +197,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    solargraph (0.45.0)
+    solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -217,7 +217,6 @@ 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)
@@ -231,7 +230,7 @@ GEM
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby

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

data/gitlab-qa.gemspec

@@ -34,6 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'rainbow', '>= 3', '< 4'
   spec.add_runtime_dependency 'table_print', '1.5.7'
-  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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'toxiproxy'
+
+require 'json'
 
 module Gitlab
   module QA
@@ -26,52 +27,48 @@ module Gitlab
             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
+          QA::Support::Shellout.shell <<~CMD
+              docker run --network #{@network} --rm curlimages/curl:7.85.0 \
+                -i -s \
+                -X POST http://#{name}:8474/populate \
+                -H 'Content-Type: application/json' \
+                -d '#{proxies.to_json}'
+          CMD
+        end
 
-            # 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
+        def proxies
+          [
+            {
+              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
+            }
+          ]
         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/release.rb

@@ -160,23 +160,27 @@ module Gitlab
             password: Runtime::Env.dev_access_token_variable,
             registry: DEV_REGISTRY
           }
-        elsif omnibus_mirror?
-          username, password = if Runtime::Env.ci_job_token && Runtime::Env.ci_pipeline_source.include?('pipeline')
-                                 ['gitlab-ci-token', Runtime::Env.ci_job_token]
-                               elsif Runtime::Env.qa_container_registry_access_token
-                                 [Runtime::Env.gitlab_username, Runtime::Env.qa_container_registry_access_token]
-                               else
-                                 Runtime::Env.require_qa_access_token!
+        elsif omnibus_mirror? || omnibus_security?
+          omnibus_login_params
+        end
+      end
 
-                                 [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
-                               end
+      def omnibus_login_params
+        username, password = if Runtime::Env.ci_job_token && Runtime::Env.ci_pipeline_source.include?('pipeline')
+                               ['gitlab-ci-token', Runtime::Env.ci_job_token]
+                             elsif Runtime::Env.qa_container_registry_access_token
+                               [Runtime::Env.gitlab_username, Runtime::Env.qa_container_registry_access_token]
+                             else
+                               Runtime::Env.require_qa_access_token!
 
-          {
-            username: username,
-            password: password,
-            registry: COM_REGISTRY
-          }
-        end
+                               [Runtime::Env.gitlab_username, Runtime::Env.qa_access_token]
+                             end
+
+        {
+          username: username,
+          password: password,
+          registry: COM_REGISTRY
+        }
       end
 
       def dev_gitlab_org?
@@ -187,6 +191,10 @@ module Gitlab
         image.start_with?("#{COM_REGISTRY}/gitlab-org/build/omnibus-gitlab-mirror/")
       end
 
+      def omnibus_security?
+        image.start_with?("#{COM_REGISTRY}/gitlab-org/security/omnibus-gitlab/")
+      end
+
       def valid?
         canonical? || release.match?(CUSTOM_GITLAB_IMAGE_REGEX)
       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/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.8.0'
+    VERSION = '8.10.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')))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.8.0
+  version: 8.10.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -212,20 +212,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.7
-- !ruby/object:Gem::Dependency
-  name: toxiproxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +254,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"
@@ -416,6 +403,7 @@ files:
 - 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