gitlab-qa 7.27.0 → 7.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6356f61652597dc3ba035658d378b9dd8567a2caad8406cecfcb333143ac8cc7
-  data.tar.gz: 34f326e02a3934f36255509268c60ba8266d9a0e3ed2f6982a1ce1731db8f8e8
+  metadata.gz: 8d4ca3feba042298fe467133b5f576653b553af61ac01a0b72a1a970917e3711
+  data.tar.gz: 61ee29dbe4355bcbc18d8e164b97f1453c461419fcf6bd70543a659e5029d333
 SHA512:
-  metadata.gz: fcc680812bf117752fc8e9bab1e02250b426792de13c38a674b5271fa127e8da564cf167b9b53224e4c454e3fc45aec114034a3a2b6a6f86f62149d206da552c
-  data.tar.gz: 9a773c6483cd726f5b84010597ae8729cc514b55f52034223b40c87e01d5409a45ad8ed0674ef89078a368fb62452de4abdcfaefe67af0bd7572733189bb6f55
+  metadata.gz: 5ddff780b5188c489bec89ce0b475096ac707f9e2e5138cc400efeef9fbd576b4c5bebc77f43af207109503e08e1c1efaf2813e3666bd9d88d5807f7c9691891
+  data.tar.gz: 34b7eacbd20c81f264aaf478f35e9ed78d5c7e185b18178bd55fa1c5fc37b0053f54bd49027d994cf91d6d69120c3371fdb818727419c17ef10ea7f373a4c91d

data/.gitignore

@@ -1,12 +1,10 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
 /.idea
 .ruby-version
 .ruby-gemset

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

@@ -245,14 +245,12 @@ generate-allure-report:
   cache:
     policy: pull
   before_script:
-    # Override allure variables for upstream triggers
-    # Override default before script and don't push cache
     - export STORAGE_CREDENTIALS=$QA_ALLURE_REPORT_GCS_CREDENTIALS
     - export GITLAB_AUTH_TOKEN=$GITLAB_QA_MR_ALLURE_REPORT_TOKEN
-    - export ALLURE_PROJECT_PATH=$TOP_UPSTREAM_SOURCE_PROJECT
-    - export ALLURE_MERGE_REQUEST_IID=$TOP_UPSTREAM_MERGE_REQUEST_IID
-    - export ALLURE_COMMIT_SHA=$TOP_UPSTREAM_SOURCE_SHA
-    - export ALLURE_JOB_NAME="${ALLURE_JOB_NAME:-package-and-qa}"
+    # Set allure variables for merge request comment based on pipeline source
+    - export ALLURE_MERGE_REQUEST_IID=${TOP_UPSTREAM_MERGE_REQUEST_IID:-$CI_MERGE_REQUEST_IID}
+    - export ALLURE_PROJECT_PATH=${TOP_UPSTREAM_SOURCE_PROJECT:-$CI_MERGE_REQUEST_PROJECT_PATH}
+    - export ALLURE_COMMIT_SHA=${TOP_UPSTREAM_SOURCE_SHA:-$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}
   rules:
     # Don't run report generation on release pipelines
     - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
@@ -260,11 +258,7 @@ generate-allure-report:
       when: never
     - if: '$CI_COMMIT_TAG'
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "parent_pipeline"  || ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
-      variables:
-        ALLURE_JOB_NAME: gitlab-qa
-      when: always
-    - if: '$TOP_UPSTREAM_SOURCE_PROJECT != null && $TOP_UPSTREAM_SOURCE_PROJECT != "" && $TOP_UPSTREAM_SOURCE_SHA != null && $TOP_UPSTREAM_SOURCE_SHA != ""'
+    - if: '$ALLURE_JOB_NAME'
       when: always
 
 generate-knapsack-report:

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

@@ -0,0 +1,25 @@
+ce:ci_decomposition:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ce-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
+  parallel: 5
+  variables:
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"
+
+ee:ci_decomposition:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .rules:ee-never-when-qa-tests-specified
+    - .test
+    - .ee-variables
+    - .high-capacity
+    - .rspec-report-opts
+    - .combined-gitlab-qa-options-script
+  parallel: 5
+  variables:
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"

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

@@ -7,7 +7,6 @@ ce:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
-    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ce:gitaly-cluster-quarantine:
   extends:
@@ -19,7 +18,6 @@ ce:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
-    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster:
   extends:
@@ -30,7 +28,6 @@ ee:gitaly-cluster:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
-    QA_LOG_PATH: "tmp/gitaly_cluster.log"
 
 ee:gitaly-cluster-quarantine:
   extends:
@@ -42,4 +39,3 @@ ee:gitaly-cluster-quarantine:
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
-    QA_LOG_PATH: "tmp/gitaly_cluster.log"

data/.gitlab-ci.yml

@@ -25,12 +25,18 @@ workflow:
   rules:
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'
+      variables:
+        ALLURE_JOB_NAME: gitlab-qa
     # For the default branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
     - if: '$CI_COMMIT_BRANCH == "master"'
-    # For tags, create a pipeline.
-    - if: '$CI_COMMIT_TAG'
+      variables:
+        ALLURE_JOB_NAME: gitlab-qa
     # For triggers from GitLab MR pipelines (and pipelines from other projects), create a pipeline
     - if: '$CI_PIPELINE_SOURCE == "pipeline"'
+      variables:
+        ALLURE_JOB_NAME: package-and-qa
+    # For tags, create a pipeline.
+    - if: '$CI_COMMIT_TAG'
     # 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"'
 
@@ -94,7 +100,6 @@ 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 actioncable
     - 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

@@ -0,0 +1,248 @@
+PATH
+  remote: .
+  specs:
+    gitlab-qa (7.29.0)
+      activesupport (~> 6.1)
+      gitlab (~> 4.18.0)
+      http (~> 5.0)
+      nokogiri (~> 1.10)
+      rainbow (~> 3.0.0)
+      table_print (= 1.5.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.6)
+      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)
+    ast (2.4.2)
+    backport (1.2.0)
+    benchmark (0.2.0)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    climate_control (1.0.1)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.10)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    crack (0.4.5)
+      rexml
+    danger (8.6.1)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (>= 1, < 4)
+    danger-gitlab (8.0.0)
+      danger
+      gitlab (~> 4.2, >= 4.2.0)
+    diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    e2mmap (0.1.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    git (1.11.0)
+      rchardet (~> 1.8)
+    gitlab (4.18.0)
+      httparty (~> 0.18)
+      terminal-table (>= 1.5.1)
+    gitlab-dangerfiles (2.11.0)
+      danger (>= 8.4.5)
+      danger-gitlab (>= 8.0.0)
+    gitlab-styles (6.2.1)
+      rubocop (~> 0.91, >= 0.91.1)
+      rubocop-gitlab-security (~> 0.1.1)
+      rubocop-performance (~> 1.9.2)
+      rubocop-rails (~> 2.9)
+      rubocop-rspec (~> 1.44)
+    hashdiff (1.0.1)
+    http (5.0.4)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nap (1.1.0)
+    no_proxy_fix (0.1.2)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    regexp_parser (2.4.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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-gitlab-security (0.1.1)
+      rubocop (>= 0.51)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    solargraph (0.45.0)
+      backport (~> 1.2)
+      benchmark
+      bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+    table_print (1.5.7)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    tilt (2.0.10)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.1)
+    unicode-display_width (1.8.0)
+    webmock (3.7.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  climate_control (~> 1.0.1)
+  gitlab-dangerfiles (~> 2.11)
+  gitlab-qa!
+  gitlab-styles (~> 6.2.1)
+  pry (~> 0.11)
+  rake (~> 13.0)
+  rspec (~> 3.7)
+  solargraph (~> 0.41)
+  webmock (= 3.7.0)
+
+BUNDLED WITH
+   2.2.33

data/docs/configuring_omnibus.md

@@ -106,7 +106,7 @@ Multiple Configurators may be specified and the order will be preserved in which
 
 E.g., given the arguments:
 
-```
+```ruby
 exe/gitlab-qa Test::Instance::Image EE --omnibus-config packages,registry
 # or
 exe/gitlab-qa Test::Instance::Image EE --omnibus-config packages --omnibus-config registry
@@ -136,7 +136,7 @@ Component::Gitlab.perform do |primary|
   primary.omnibus_configuration << <<~OMNIBUS
     geo_primary_role['enable'] = true
   OMNIBUS
-  
+
   primary.instance do
     Component::Gitlab.perform do |secondary|
       secondary.omnibus_configuration << <<~OMNIBUS
@@ -181,10 +181,10 @@ one Omnibus configuration that might be unneccesary or Invalid for the Second In
 
 1. `Runtime::OmnibusConfigurations::Default`
 1. `Runtime::OmnibusConfigurations::[A,B,...]` where `A` and `B` are Configurators specified through the positional arguments `--a --b`
-1. Custom written `Scenario::Template` (such as `Test::Integation::Geo`)
+1. Custom written `Scenario::Template` (such as `Test::Integration::Geo`)
 1. `lib/gitlab/qa/component/gitlab.rb`
 
-From top to bottom, configurations will be loaded and any configurations that are superceded, will take precedence over the one before it, and so on.
+From top to bottom, configurations will be loaded and any configurations that are superseded, will take precedence over the one before it, and so on.
 
 ### Executing arbitrary shell commands within the GitLab Instance
 

data/docs/what_tests_can_be_run.md

@@ -68,7 +68,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `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|
 | `QA_DEBUG` |-  | Set to `true` to verbosely log page object actions. Note: if enabled be aware that sensitive data might be logged. If an input element has a QA selector with `password` in the name, data entered into the input element will be masked. If the element doesn't have `password` in its name it won't be masked. | No|
-| `QA_LOG_PATH` |-  | Path to output debug logging to. If not set logging will be output to STDOUT. | No|
+| `QA_LOG_PATH` |-  | Path to output debug logging to. By default `QA_ARTIFACTS_DIR` is used | No|
 | `QA_CAN_TEST_GIT_PROTOCOL_V2` | `true` | Set to `false` to skip tests that require Git protocol v2 if your environment doesn't support it. | No|
 | `QA_CAN_TEST_ADMIN_FEATURES` | `true` | Set to `false` to skip tests that require admin access. | No|
 | `QA_CAN_TEST_PRAEFECT` | `true` | Set to `false` to skip tests that require Praefect to be running. | No|
@@ -651,23 +651,6 @@ $ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
 $ gitlab-qa Test::Integration::Jira EE
 ```
 
-### `Test::Integration::Actioncable CE|EE|<full image address>`
-
-This tests the real-time assignees feature by setting
-`actioncable['enable'] = true` in the Omnibus configuration
-before starting 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 `--tag actioncable` RSpec parameter,
-which runs only the tests with `:actioncable` metadata.
-
-Example:
-
-```
-$ gitlab-qa Test::Integration::Actioncable CE
-```
-
 ### `Test::Integration::Integrations CE|<full image address>`
 
 This scenario is intended to test the different integrations that a GitLab instance can offer, such as WebHooks to an external service, Jenkins, etc.
@@ -944,6 +927,14 @@ This scenario is a composition of two orchestrated scenarios. It tests the conta
  GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt) gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
  ```
 
+### Test::Instance::Image EE --omnibus-config ci_decomposition
+
+This scenario is to run tests against GitLab instance with [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) on a single Postgres:
+
+ ```ruby
+gitlab-qa Test::Instance::Image EE --omnibus-config ci_decomposition
+ ```
+
 ### `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/lib/gitlab/qa/component/base.rb

@@ -15,8 +15,7 @@ module Gitlab
           @environment = {}
           @volumes = {}
           @network_aliases = []
-
-          self.exec_commands = []
+          @exec_commands = []
         end
 
         def add_network_alias(name)

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

@@ -22,6 +22,7 @@ module Gitlab
 
             command.env("discovery.type", "single-node")
             command.env("ES_JAVA_OPTS", "-Xms512m -Xmx512m")
+            command.env("xpack.security.enabled", "false")
           end
         end
       end

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

@@ -155,7 +155,6 @@ module Gitlab
           setup_omnibus
 
           @docker.attach(name) do |line, wait|
-            puts line
             # TODO, workaround which allows to detach from the container
             break if /gitlab Reconfigured!/.match?(line)
           end
@@ -174,11 +173,15 @@ module Gitlab
         def process_exec_commands
           @docker.copy(name, DATA_SEED_PATH, DATA_PATH) if seed_admin_token || seed_db
 
-          self.exec_commands += seed_admin_token_command if seed_admin_token
-          self.exec_commands += seed_test_data_command if seed_db
+          exec_commands << seed_admin_token_command if seed_admin_token
+          exec_commands << seed_test_data_command if seed_db
+          exec_commands << Runtime::Scenario.omnibus_exec_commands
+
+          commands = exec_commands.flatten.uniq
+          return if commands.empty?
 
           Runtime::Logger.info("Running exec_commands...")
-          exec_commands.flatten.uniq.each { |command| @docker.exec(name, command) }
+          commands.each { |command| @docker.exec(name, command) }
         end
 
         def sha_version

data/lib/gitlab/qa/docker/engine.rb

@@ -15,8 +15,13 @@ module Gitlab
           Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
         end
 
-        def pull(image:, tag: nil)
-          Docker::Command.execute("pull #{full_image_name(image, tag)}")
+        def pull(image:, tag: nil, quiet: true)
+          Docker::Command.new("pull").tap do |command|
+            command << "-q" if quiet
+            command << full_image_name(image, tag)
+
+            command.execute!
+          end
         end
 
         def run(image:, tag: nil, args: [])

data/lib/gitlab/qa/docker/shellout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 require 'rainbow/refinement'
 
@@ -6,35 +8,42 @@ module Gitlab
     module Docker
       class Shellout
         using Rainbow
+
         StatusError = Class.new(StandardError)
 
         def initialize(command)
           @command = command
           @output = []
-
-          Rainbow.enabled = Runtime::Env.colorized_logs?
-          Runtime::Logger.info("Docker shell command: `#{@command.mask_secrets}`".cyan)
+          @logger = Runtime::Logger.logger
         end
 
         def execute! # rubocop:disable Metrics/AbcSize
           raise StatusError, 'Command already executed' if @output.any?
 
+          @logger.info("Docker shell command: `#{@command.mask_secrets}`".cyan)
+
           Open3.popen2e(@command.to_s) do |_in, out, wait|
             out.each do |line|
               @output.push(line)
-
-              if block_given?
-                yield line, wait
-              else
-                puts line
-              end
+              print "." unless Runtime::Env.ci # indicate progress for local run
+              yield line, wait if block_given?
             end
+            puts unless Runtime::Env.ci # add newline after progress dots
 
-            if wait.value.exited? && wait.value.exitstatus.nonzero? # rubocop:disable Style/IfUnlessModifier
+            if wait.value.exited? && wait.value.exitstatus.nonzero?
+              @logger.error("Docker shell command output:\n#{output}")
               raise StatusError, "Docker command `#{@command.mask_secrets}` failed! ✘"
             end
+
+            @logger.debug("Docker shell command output:\n#{output}") unless output.empty?
           end
 
+          output
+        end
+
+        private
+
+        def output
           @output.join.chomp
         end
       end

data/lib/gitlab/qa/report/test_result.rb

@@ -114,6 +114,9 @@ module Gitlab
                 line.include?(File.basename(report['file_path']))
               end
 
+              exception['message'].gsub!(/(private_token=)[\w-]+/, '********')
+              exception['message_lines'].each { |line| line.gsub!(/(private_token=)([\w-]+)/, '********') }
+
               {
                 'message' => "#{exception['class']}: #{exception['message']}",
                 'message_lines' => exception['message_lines'],
@@ -145,6 +148,7 @@ module Gitlab
 
           private
 
+          # rubocop:disable Metrics/AbcSize
           def failures_from_exceptions
             failures = report.search('failure')
             return [] if failures.empty?
@@ -155,12 +159,15 @@ module Gitlab
                 line.include?(File.basename(report['file']))
               end
 
+              exception['message'].gsub!(/(private_token=)[\w-]+/, '********')
+
               {
                 'message' => "#{exception['type']}: #{exception['message']}",
                 'stacktrace' => trace.slice(0..spec_file_first_index).join("\n")
               }
             end
           end
+          # rubocop:enable Metrics/AbcSize
         end
       end
     end

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

@@ -27,7 +27,6 @@ module Gitlab
           'QA_COOKIES' => :qa_cookie,
           'QA_DEBUG' => :qa_debug,
           'QA_DEFAULT_BRANCH' => :qa_default_branch,
-          'QA_LOG_PATH' => :qa_log_path,
           'QA_CAN_TEST_ADMIN_FEATURES' => :qa_can_test_admin_features,
           'QA_CAN_TEST_GIT_PROTOCOL_V2' => :qa_can_test_git_protocol_v2,
           'QA_CAN_TEST_PRAEFECT' => :qa_can_test_praefect,
@@ -168,6 +167,14 @@ module Gitlab
           enabled?(ENV['QA_DEBUG'], default: true)
         end
 
+        def log_level
+          env_var_value_if_defined('QA_LOG_LEVEL')&.upcase || 'INFO'
+        end
+
+        def log_path
+          env_var_value_if_defined('QA_LOG_PATH') || host_artifacts_dir
+        end
+
         def default_branch
           env_var_value_if_defined('QA_DEFAULT_BRANCH') || 'main'
         end

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

@@ -11,7 +11,15 @@ module Gitlab
         def_delegators :logger, :debug, :info, :warn, :error, :fatal, :unknown
 
         def self.logger
-          @logger ||= QA::TestLogger.logger(level: Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::INFO)
+          @logger ||= begin
+            log_path = Runtime::Env.log_path
+            FileUtils.mkdir_p(log_path) unless File.exist?(log_path)
+
+            QA::TestLogger.logger(
+              level: Runtime::Env.debug? ? "DEBUG" : Runtime::Env.log_level,
+              path: log_path
+            )
+          end
         end
       end
     end

data/lib/gitlab/qa/runtime/omnibus_configurations/ci_decomposition.rb

@@ -22,7 +22,8 @@ module Gitlab
               "gitlab-psql -c 'create database gitlabhq_production_ci owner gitlab'",
               "gitlab-psql -d gitlabhq_production_ci -c 'create extension btree_gist'",
               "gitlab-psql -d gitlabhq_production_ci -c 'create extension pg_trgm'",
-              "gitlab-rake db:structure:load:ci"
+              "gitlab-rake db:structure:load:ci",
+              "gitlab-ctl restart"
             ].freeze
           end
         end

data/lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb

@@ -5,21 +5,19 @@ module Gitlab
     module Runtime
       module OmnibusConfigurations
         class ObjectStorage < Default
-          TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy].freeze
+          TYPES = %w[artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages].freeze
 
           def configuration
-            TYPES.each_with_object(+'') do |object_type, omnibus|
+            config = TYPES.each_with_object(+'') do |object_type, omnibus|
               omnibus << <<~OMNIBUS
-                gitlab_rails['#{object_type}_enabled'] = true
-                gitlab_rails['#{object_type}_storage_path'] = '/var/opt/gitlab/gitlab-rails/shared/#{object_type}'
-                gitlab_rails['#{object_type}_object_store_enabled'] = true
-                gitlab_rails['#{object_type}_object_store_remote_directory'] = '#{object_type}-bucket'
-                gitlab_rails['#{object_type}_object_store_background_upload'] = false
-                gitlab_rails['#{object_type}_object_store_direct_upload'] = true
-                gitlab_rails['#{object_type}_object_store_proxy_download'] = true
-                gitlab_rails['#{object_type}_object_store_connection'] = #{minio.to_config}
+                gitlab_rails['object_store']['objects']['#{object_type}']['bucket'] = '#{object_type}-bucket'
               OMNIBUS
             end
+            config << <<~OMNIBUS
+              gitlab_rails['object_store']['enabled'] = true
+              gitlab_rails['object_store']['proxy_download'] = true
+              gitlab_rails['object_store']['connection'] = #{minio.to_config}
+            OMNIBUS
           end
 
           def prepare

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

@@ -13,6 +13,7 @@ module Gitlab
                 gitlab.release = release
                 gitlab.network = 'test'
                 gitlab.name = 'gitlab'
+                gitlab.seed_admin_token = false
                 sign_url_key_path = gitlab.copy_key_file('GOOGLE_CDN_SIGNURL_KEY')
                 cdn_gcloud_path = gitlab.copy_key_file('GOOGLE_CDN_JSON_KEY')
 

data/lib/gitlab/qa/test_logger.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require 'logger'
 require 'rainbow'
+require 'active_support/logger'
 
 module Gitlab
   module QA
     # Common test logger implementation
     #
     class TestLogger
+      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
       LEVEL_COLORS = {
         "DEBUG" => :magenta,
         "INFO" => :green,
@@ -18,17 +19,62 @@ module Gitlab
 
       Rainbow.enabled = Runtime::Env.colorized_logs?
 
-      def self.logger(level: ::Logger::INFO, source: 'Gitlab QA')
-        ::Logger.new($stdout).tap do |logger|
-          logger.level = level
+      class << self
+        # Combined logger instance
+        #
+        # @param [<Symbol, String>] level
+        # @param [String] source
+        # @return [ActiveSupport::Logger]
+        def logger(level: :info, source: 'Gitlab QA', path: 'tmp')
+          console_log = console_logger(level: level, source: source)
+          file_log = file_logger(source: source, path: path)
 
-          logger.formatter = proc do |severity, datetime, progname, msg|
-            date_format = datetime.strftime("%Y-%m-%d %H:%M:%S")
-            msg_prefix = "[date=#{date_format} from=#{source}] #{severity.ljust(5)} -- "
+          console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+        end
+
+        private
+
+        # Console logger instance
+        #
+        # @param [<Symbol, String>] level
+        # @param [String] source
+        # @return [ActiveSupport::Logger]
+        def console_logger(level:, source:)
+          ActiveSupport::Logger.new($stdout, level: level, datetime_format: TIME_FORMAT).tap do |logger|
+            logger.formatter = proc do |severity, datetime, progname, msg|
+              msg_prefix = message_prefix(datetime, source, severity)
+
+              Rainbow(msg_prefix).public_send(LEVEL_COLORS.fetch(severity, :silver)) + "#{msg}\n" # rubocop:disable GitlabSecurity/PublicSend
+            end
+          end
+        end
+
+        # File logger
+        #
+        # @param [String] source
+        # @param [String] path
+        # @return [ActiveSupport::Logger]
+        def file_logger(source:, path:)
+          log_file = "#{path}/#{source.downcase.tr(' ', '-')}.log"
+
+          ActiveSupport::Logger.new(log_file, level: :debug, datetime_format: TIME_FORMAT).tap do |logger|
+            logger.formatter = proc do |severity, datetime, progname, msg|
+              msg_prefix = message_prefix(datetime, source, severity)
 
-            Rainbow(msg_prefix).public_send(LEVEL_COLORS.fetch(severity, :silver)) + "#{msg}\n" # rubocop:disable GitlabSecurity/PublicSend
+              "#{msg_prefix}#{msg}\n"
+            end
           end
         end
+
+        # Log message prefix
+        #
+        # @param [DateTime] date
+        # @param [String] source
+        # @param [String] severity
+        # @return [String]
+        def message_prefix(date, source, severity)
+          "[date=#{date} from=#{source}] #{severity.ljust(5)} -- "
+        end
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.27.0'
+    VERSION = '7.29.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -55,7 +55,6 @@ module Gitlab
         end
 
         module Integration
-          autoload :Actioncable, 'gitlab/qa/scenario/test/integration/actioncable'
           autoload :Geo, 'gitlab/qa/scenario/test/integration/geo'
           autoload :LDAP, 'gitlab/qa/scenario/test/integration/ldap'
           autoload :LDAPNoTLS, 'gitlab/qa/scenario/test/integration/ldap_no_tls'

data/scripts/generate-qa-jobs.rb

@@ -15,6 +15,7 @@ class GenerateQAJobs
     jobs.concat(load_yml_contents('custom_parallel'))
     jobs.concat(load_yml_contents('instance')) if should_run?('test_instance_all')
     jobs.concat(load_yml_contents('relative_url')) if should_run?('test_instance_all')
+    jobs.concat(load_yml_contents('ci_decomposition')) if should_run?('test_instance_all')
     jobs.concat(load_yml_contents('repository_storage')) if should_run?('test_instance_all_repository_storage')
     jobs.concat(load_yml_contents('omnibus_image'))
     jobs.concat(load_yml_contents('update')) if should_run?('test_instance_all')
@@ -33,7 +34,6 @@ class GenerateQAJobs
     jobs.concat(load_yml_contents('object_storage_registry_tls')) if should_run?('test_integration_registrytls')
     jobs.concat(load_yml_contents('registry')) if should_run?('test_integration_registry')
     jobs.concat(load_yml_contents('packages')) if should_run?('test_instance_all_packages')
-    jobs.concat(load_yml_contents('actioncable')) if should_run?('test_instance_all_actioncable')
     jobs.concat(load_yml_contents('elasticsearch')) if should_run?('test_integration_elasticsearch')
     jobs.concat(load_yml_contents('praefect')) if should_run?('test_instance_all')
     jobs.concat(load_yml_contents('gitaly_cluster')) if should_run?('test_instance_all')

data/tmp/.gitignore

@@ -0,0 +1,3 @@
+**
+
+!.gitignore

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.27.0
+  version: 7.29.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -218,8 +218,8 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
-- ".gitlab/ci/jobs/actioncable.gitlab-ci.yml"
 - ".gitlab/ci/jobs/base.gitlab-ci.yml"
+- ".gitlab/ci/jobs/ci_decomposition.gitlab-ci.yml"
 - ".gitlab/ci/jobs/cloud_activation.gitlab-ci.yml"
 - ".gitlab/ci/jobs/custom_parallel.gitlab-ci.yml"
 - ".gitlab/ci/jobs/ee_previous_to_ce_update.gitlab-ci.yml"
@@ -264,6 +264,7 @@ files:
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -363,7 +364,6 @@ 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/actioncable.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
@@ -410,6 +410,7 @@ files:
 - tls_certificates/gitlab/gitlab.test.crt
 - tls_certificates/gitlab/gitlab.test.csr
 - tls_certificates/gitlab/gitlab.test.key
+- tmp/.gitignore
 homepage: http://about.gitlab.com/
 licenses:
 - MIT

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

@@ -1,41 +0,0 @@
-ce:actioncable:
-  extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
-    - .test
-    - .high-capacity
-    - .ce-variables
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Actioncable"
-
-ce:actioncable-quarantine:
-  extends:
-    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
-    - .test
-    - .high-capacity
-    - .ce-variables
-    - .quarantine
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Actioncable"
-
-ee:actioncable:
-  extends:
-    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
-    - .test
-    - .high-capacity
-    - .ee-variables
-    - .rspec-report-opts
-  variables:
-    QA_SCENARIO: "Test::Integration::Actioncable"
-
-ee:actioncable-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::Actioncable"

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

@@ -1,34 +0,0 @@
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Integration
-          class Actioncable < Scenario::Template
-            def perform(release, *rspec_args)
-              Component::Gitlab.perform do |gitlab|
-                gitlab.release = QA::Release.new(release)
-                gitlab.name = 'gitlab-actioncable'
-                gitlab.network = 'test'
-                gitlab.omnibus_configuration << "actioncable['enable'] = true"
-
-                gitlab.instance do
-                  Runtime::Logger.info('Running actioncable specs!')
-
-                  rspec_args << "--" unless rspec_args.include?('--')
-                  rspec_args << %w[--tag actioncable]
-
-                  Component::Specs.perform do |specs|
-                    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