gitlab-qa 8.9.0 → 8.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ffa49a5a85a5e660bb61689d01b0a7daa3a0004f7e05e5a9100dd83dbeeea55
-  data.tar.gz: 8f158219d4c59b3db6181534eafdd55e5ca2abbcae1a0402c4f80d3f8c77fa82
+  metadata.gz: 81e48c81786f8f96655e3c8096e804cf08b1ca602133fb10b3238d581df26957
+  data.tar.gz: faf446327a9eba30bb029771ca8658097da2b3852a4389fe1d3309cf370c037f
 SHA512:
-  metadata.gz: 7cb6f4b7197625d3db353048368716a80e7bdf17e7060cfaadf90a13d44c96805c76e396b3fa78a6e777dacad191305c12ec78e8c9e8920d3a09100f7d2ebd56
-  data.tar.gz: cfec5285a2a0d54986d3984f333497082911febee8d3a368dc2be3f81d04753e2c8a726bd8515d1be62181a591077eb4c47555865e1fc331ace507289adc47a3
+  metadata.gz: ee989bb53b1fae1ff3ab34780f20b8cb609cb23aee4d74ec04d2b7f31aeae78d136157044009e79fa53084f9edb168c69150596fedab77670385b5e56803138c
+  data.tar.gz: 1d3355039191667d8415097781afc5f49294e4c0fe9c10407c92537085ee088e642cf167518e2a4688faeb4410f20c7e2cc9e70d7d6bd0c05539fbd0667f43c1

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

@@ -4,7 +4,7 @@ stages:
   - notify
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.7
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3-docker-${DOCKER_VERSION}
   tags:
     - gitlab-org
   cache:
@@ -12,6 +12,7 @@ default:
       files:
         - Gemfile.lock
         - gitlab-qa.gemspec
+      prefix: $RUBY_VERSION
     paths:
       - vendor/ruby
   before_script:
@@ -79,6 +80,8 @@ variables:
   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"
+  RUBY_VERSION: "2.7"
+  DOCKER_VERSION: "20.10.14"
 
 .ce-variables:
   variables:

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-qa/commits/mast
 - Checklist after merging:
   - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~Quality ~"type::maintenance"
+/label ~Quality ~"type::maintenance" ~"maintenance::dependency"

data/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-ruby-2.7
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
   tags:
     - gitlab-org
   cache:
@@ -13,6 +13,7 @@ default:
       files:
         - Gemfile.lock
         - gitlab-qa.gemspec
+      prefix: $RUBY_VERSION
     paths:
       - vendor/ruby
   before_script:
@@ -40,16 +41,24 @@ workflow:
     # When using Run pipeline button in the GitLab UI, from the project’s CI/CD > Pipelines section, create a pipeline.
     - if: '$CI_PIPELINE_SOURCE == "web"'
 
+variables:
+  RUBY_VERSION: "2.7"
+
 .check-base:
   stage: check
-  script:
-    - bundle exec $CI_JOB_NAME --color
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["2.7", "3.0"]
 
 rubocop:
   extends: .check-base
+  script:
+    - bundle exec rubocop --color
 
 rspec:
   extends: .check-base
+  script:
+    - bundle exec rspec --force-color
 
 prepare:
   stage: generate

data/.rubocop.yml

@@ -39,3 +39,7 @@ Layout/SpaceBeforeFirstArg:
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
+
+CodeReuse/ActiveRecord:
+  Exclude:
+    - 'spec/**/*_spec.rb'

data/Gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.9.0)
+    gitlab-qa (8.10.1)
       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/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/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/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/support/shell_command.rb

@@ -32,7 +32,7 @@ module Gitlab
 
           logger.info("Shell command: `#{mask_secrets(command).cyan}`")
 
-          Open3.popen2e(@command.to_s) do |stdin, out, wait|
+          Open3.popen2e(command.to_s) do |stdin, out, wait|
             if @stdin_data
               stdin.puts(@stdin_data)
               stdin.close
@@ -90,7 +90,7 @@ module Gitlab
         # @param [String] input the string to mask
         # @return [String] The masked string
         def mask_secrets(input)
-          @mask_secrets.each_with_object(+input) { |secret, s| s.gsub!(secret, '*****') }.to_s
+          @mask_secrets.reduce(input) { |s, secret| s.gsub(secret, '*****') }.to_s
         end
       end
     end

data/lib/gitlab/qa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.9.0
+  version: 8.10.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-31 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