gitlab-qa 7.27.2 → 7.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888a15b623b94cf6a072af7edf18d11952ff971a661d1fd4d154b28a627c9509
-  data.tar.gz: c5e6cb25a0ecda8f4237186249ec44b246254df78b26e1372569500c00901c6c
+  metadata.gz: 04b20a54aa036ec24fb463e50ad5b4be00f81a054cdae02dee966b38c0538c56
+  data.tar.gz: d8c1715674a879d58359d8f8293452f68ae4d516e4c19d4ad888f34ac018498d
 SHA512:
-  metadata.gz: 17a2b9f2863cf42a36f5e72e39a90b17ad00367be81ec2f5e61b35299086e470f227d46c5e1b186abb52c49bab82d6289010a0e4e1410f74d51e779a1cfadec0
-  data.tar.gz: cfb21124fbd588d157ce8f93fb83300fdb521ddfbfde2e1fd4853aa966cf418075607496671aa5a739656d33acead7524e607076945b305279fa4db94d61a80c
+  metadata.gz: 5ccf3ee587dfef9f148fa98aa47b043bb6e2487aca12eb699f489f86fdf05f3939e5ece80ddde46a4e01b9b183dfb24742b287ac616ebc0939665786e8bbeba0
+  data.tar.gz: bc1a167d1b2500974abe0b3ec7f7966debe7b7f211f79324f87685f2e0906606e0c2799164f03adfff69d1af97697cf10128c6fe45eec46534832ad4b4ff0fb5

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

@@ -70,6 +70,8 @@ workflow:
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
+  COLORIZED_LOGS: "true"
+  QA_DEBUG: "false"
   QA_CAN_TEST_GIT_PROTOCOL_V2: "true"
   QA_CAN_TEST_PRAEFECT: "false"
   QA_GENERATE_ALLURE_REPORT: "true"

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

@@ -10,7 +10,6 @@ ce:ci_decomposition:
   parallel: 5
   variables:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"
-  allow_failure: true # https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1329
 
 ee:ci_decomposition:
   extends:
@@ -24,4 +23,3 @@ ee:ci_decomposition:
   parallel: 5
   variables:
     GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --omnibus-config ci_decomposition"
-  allow_failure: true # https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1329

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/.rubocop.yml

@@ -36,3 +36,6 @@ Style/SignalException:
 
 Layout/SpaceBeforeFirstArg:
   Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/.rubocop_todo.yml

@@ -89,11 +89,6 @@ RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/gitlab/qa/scenario/test/instance/deployment_base_spec.rb'
 
-# Offense count: 221
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 22
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/ExplicitBlockArgument:

data/Gemfile.lock

@@ -0,0 +1,248 @@
+PATH
+  remote: .
+  specs:
+    gitlab-qa (7.30.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.2)
+    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/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|
@@ -712,6 +712,23 @@ in the GitLab project).
   This is used to retrieve the version that staging is currently running.
   This can be found in the shared 1Password vault.
 
+- `GITLAB_USERNAME`: An existing user.
+
+- `GITLAB_PASSWORD`: The user's password.
+
+**Required by specific tests:**
+
+- `QA_PRAEFECT_REPOSITORY_STORAGE`: The name of a Gitaly Cluster storage.
+
+- `GITLAB_ADMIN_USERNAME`: An existing user with administrator access. Required by tests that set feature flags or
+  perform other admin actions.
+
+- `GITLAB_ADMIN_PASSWORD`: The administrator user's password.
+
+- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
+
+- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
+
 **Optional environment variables:**
 
 - `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
@@ -719,17 +736,24 @@ in the GitLab project).
   This is used to pull the QA Docker image from the Omnibus GitLab `dev` Container Registry.
   If the variable isn't present, the QA image from Docker Hub will be used.
   This can be found in the shared 1Password vault.
+  Please note that this variable must be provided when you need to be sure the version of the
+  tests matches the version of GitLab on Staging. If the version from Docker Hub is used it might not include changes deployed to Staging very recently.
 
-Example:
+An example of how to run the smoke tests:
 
 ```
-$ export GITLAB_QA_USER_AGENT="$GITLAB_QA_USER_AGENT"
-$ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
-$ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
+$ export GITLAB_QA_USER_AGENT="<value from 1Password>"
+$ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
 $ export GITLAB_USERNAME="gitlab-qa"
-$ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
+$ export GITLAB_PASSWORD="<value from 1Password>"
+$ export GITLAB_ADMIN_USERNAME="<value from 1Password>"
+$ export GITLAB_ADMIN_PASSWORD="<value from 1Password>"
+$ export GITLAB_QA_USERNAME_1="gitlab-qa-user1"
+$ export GITLAB_QA_PASSWORD_1="<value from 1Password>"
+$ export QA_PRAEFECT_REPOSITORY_STORAGE="nfs-file22"
 
-$ gitlab-qa Test::Instance::Staging
+$ gitlab-qa Test::Instance::Staging -- --tag smoke
 ```
 
 ### `Test::Instance::StagingRef`
@@ -828,6 +852,52 @@ by setting `QA_COOKIES=gitlab_canary=true`. This adds a cookie
 to all web requests which will result in them being routed
 to the canary fleet.
 
+**Required environment variables:**
+
+- `GITLAB_QA_USER_AGENT`: The browser user-agent to use instead of the default Chrome user-agent.
+  This is needed for the automated tests to bypass the WAF
+
+- `GITLAB_QA_ACCESS_TOKEN`: A valid personal access token with the `api` scope.
+  This is used to retrieve the version that staging is currently running.
+  This can be found in the shared 1Password vault.
+
+- `GITLAB_USERNAME`: An existing user.
+
+- `GITLAB_PASSWORD`: The user's password.
+
+**Required by specific tests:**
+
+- `GITLAB_QA_USERNAME_X`: The username of a pre-generated test user, where `X` is `1` to `6`.
+
+- `GITLAB_QA_PASSWORD_X`: The pre-generated test user's password.
+
+**Optional environment variables:**
+
+- `GITLAB_QA_DEV_ACCESS_TOKEN`: A valid personal access token for the
+  `gitlab-qa-bot` on `dev.gitlab.org` with the `registry` scope.
+  This is used to pull the QA Docker image from the Omnibus GitLab `dev` Container Registry.
+  If the variable isn't present, the QA image from Docker Hub will be used.
+  This can be found in the shared 1Password vault.
+  Please note that this variable should be provided when you need to be sure the version of the
+  tests matches the version of GitLab on Staging. If the version from Docker Hub is used it might not include changes deployed to Staging very recently.
+
+An example of how to run the smoke tests:
+
+```
+$ export GITLAB_QA_USER_AGENT="<value from 1Password>"
+$ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
+$ export GITLAB_USERNAME="gitlab-qa"
+$ export GITLAB_PASSWORD="<value from 1Password>"
+$ export GITLAB_QA_USERNAME_1="gitlab-qa-user1"
+$ export GITLAB_QA_PASSWORD_1="<value from 1Password>"
+$ export QA_CAN_TEST_GIT_PROTOCOL_V2="false"
+$ export QA_CAN_TEST_ADMIN_FEATURES="false"
+$ export QA_CAN_TEST_PRAEFECT="false"
+
+$ gitlab-qa Test::Instance::Production -- --tag smoke
+```
+
 ### `Test::Instance::Preprod`
 
 This scenario functions the same as `Test::Instance::Staging`

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/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,22 +173,29 @@ 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
-          self.exec_commands += Runtime::Scenario.omnibus_exec_commands
+          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
+          exec_commands << add_git_server_hooks unless Runtime::Scenario.skip_server_hooks
+
+          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
+        def rails_version
           json = @docker.read_file(
             @release.image, @release.tag,
             '/opt/gitlab/version-manifest.json'
           )
 
           manifest = JSON.parse(json)
-          manifest['software']['gitlab-rails']['locked_version']
+          {
+            sha: manifest['software']['gitlab-rails']['locked_version'],
+            source: manifest['software']['gitlab-rails']['locked_source']['git']
+          }
         end
 
         def copy_key_file(env_key)
@@ -241,6 +247,25 @@ module Gitlab
           ["gitlab-rails runner #{DATA_PATH}/admin_access_token_seed.rb"]
         end
 
+        def add_git_server_hooks
+          global_server_prereceive_hook = <<~SCRIPT
+            #!/usr/bin/env bash
+
+            if [[ \\\$GL_PROJECT_PATH =~ 'reject-prereceive' ]]; then
+              echo 'GL-HOOK-ERR: Custom error message rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive'
+              exit 1
+            fi
+          SCRIPT
+
+          [
+            @docker.exec(name, 'mkdir -p /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d'),
+            @docker.write_files(name) do |f|
+              f.write('/opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/pre-receive.d', global_server_prereceive_hook, false)
+            end,
+            @docker.exec(name, 'chmod +x /opt/gitlab/embedded/service/gitlab-shell/hooks/pre-receive.d/*')
+          ]
+        end
+
         class Availability
           def initialize(name, relative_path: '', scheme: 'http', protocol_port: 80)
             @docker = Docker::Engine.new

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

@@ -11,7 +11,7 @@ module Gitlab
         attr_accessor :suite, :release, :network, :args, :volumes, :env, :runner_network, :hostname
 
         def initialize
-          @docker = Docker::Engine.new
+          @docker = Docker::Engine.new(stream_output: true) # stream test output directly instead of through logger
           @volumes = {}
           @env = {}
         end

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

@@ -2,11 +2,17 @@ module Gitlab
   module QA
     module Docker
       class Command
-        attr_reader :args
+        attr_reader :args, :stream_output
 
-        def initialize(cmd = nil, mask_secrets: nil)
+        # Shell command
+        #
+        # @param [<String, Array>] cmd
+        # @param [<String, Array>] mask_secrets
+        # @param [Boolean] stream_output stream command output to stdout directly instead of logger
+        def initialize(cmd = nil, mask_secrets: nil, stream_output: false)
           @args = Array(cmd)
           @mask_secrets = Array(mask_secrets)
+          @stream_output = stream_output
         end
 
         def <<(*args)

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

@@ -7,6 +7,12 @@ module Gitlab
         DOCKER_HOST = ENV['DOCKER_HOST'] || 'http://localhost'
         PRIVILEGED_COMMANDS = [/^iptables.*/].freeze
 
+        attr_reader :stream_output
+
+        def initialize(stream_output: false)
+          @stream_output = stream_output
+        end
+
         def hostname
           URI(DOCKER_HOST).host
         end
@@ -15,12 +21,17 @@ 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: [])
-          Docker::Command.new('run').tap do |command|
+          Docker::Command.new('run', stream_output: stream_output).tap do |command|
             yield command if block_given?
 
             command << full_image_name(image, tag)
@@ -50,8 +61,15 @@ module Gitlab
         def write_files(name)
           exec(name, yield(
             Class.new do
-              def self.write(file, contents)
-                %(echo "#{contents}" > #{file};)
+              # @param file The name of the file
+              # @param contents The content of the file to write
+              # @param expand_vars Set false if you need to write an environment variable '$' to a file. The variable should be escaped \\\$
+              def self.write(file, contents, expand_vars = true)
+                if expand_vars
+                  %(echo "#{contents}" > #{file};)
+                else
+                  %(echo '#{contents}' > #{file};)
+                end
               end
 
               def self.append(file, contents)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 require 'rainbow/refinement'
 
@@ -6,35 +8,57 @@ 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
 
+        attr_reader :command, :logger
+
         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
+              if stream_progress
+                print "."
+              elsif command.stream_output
                 puts line
               end
+
+              yield line, wait if block_given?
             end
+            puts if stream_progress
 
-            if wait.value.exited? && wait.value.exitstatus.nonzero? # rubocop:disable Style/IfUnlessModifier
-              raise StatusError, "Docker command `#{@command.mask_secrets}` failed! ✘"
+            if wait.value.exited? && wait.value.exitstatus.nonzero?
+              logger.error("Docker shell command output:\n#{output}") unless command.stream_output
+              raise StatusError, "Docker command `#{@command.mask_secrets[0..100]}` failed! ✘"
             end
+
+            logger.debug("Docker shell command output:\n#{output}") unless command.stream_output || output.empty?
           end
 
+          output
+        end
+
+        private
+
+        # Stream only command execution progress and log output when command finished
+        #
+        # @return [Boolean]
+        def stream_progress
+          !(Runtime::Env.ci || command.stream_output)
+        end
+
+        def output
           @output.join.chomp
         end
       end

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

@@ -210,10 +210,10 @@ module Gitlab
 
           failure = full_stacktrace(test)
 
-          if test.screenshot? && !failure.include?('500 Internal Server Error') && !failure.include?('fabricate_via_api!')
+          if test.screenshot? && !['500 Internal Server Error', 'fabricate_via_api!', 'Error Code 500'].any? { |e| failure.include?(e) }
             relative_url = gitlab.upload_file(file_fullpath: test.failure_screenshot)
 
-            section = "### Screenshot: #{relative_url.markdown}"
+            section = "### Screenshot: #{relative_url.markdown}" if relative_url
           end
 
           section

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

@@ -7,7 +7,9 @@ module Gitlab
       class ReportResults < ReportAsIssue
         attr_accessor :testcase_project_reporter, :results_issue_project_reporter, :files, :test_case_project, :results_issue_project, :gitlab
 
-        def initialize(token:, input_files:, test_case_project:, results_issue_project:, dry_run: false, **kwargs)
+        IGNORE_EXCEPTIONS = ['Net::ReadTimeout'].freeze
+
+        def initialize(token:, input_files:, test_case_project: nil, results_issue_project: nil, dry_run: false, **kwargs)
           @testcase_project_reporter = Gitlab::QA::Report::ResultsInTestCases.new(token: token, input_files: input_files, project: test_case_project, dry_run: dry_run, **kwargs)
           @results_issue_project_reporter = Gitlab::QA::Report::ResultsInIssues.new(token: token, input_files: input_files, project: results_issue_project, dry_run: dry_run, **kwargs)
           @test_case_project = test_case_project
@@ -32,7 +34,7 @@ module Gitlab
             test_results.each do |test|
               puts "Reporting test: #{test.file} | #{test.name}\n"
 
-              report_test(test) unless test.skipped
+              report_test(test) if should_report?(test)
             end
 
             test_results.write
@@ -54,6 +56,40 @@ module Gitlab
           testcase_project_reporter.update_testcase(testcase, test)
           results_issue_project_reporter.update_issue(issue, test)
         end
+
+        # Checks if a test result should be reported.
+        #
+        # @return [Boolean] false if the test was skipped or failed because of a transient error that can be ignored.
+        # Otherwise returns true.
+        def should_report?(test)
+          return false if test.skipped
+
+          if test.report.key?('exceptions')
+            reason = ignore_failure_reason(test.report['exceptions'])
+
+            if reason
+              puts "Issue update skipped because #{reason}"
+
+              return false
+            end
+          end
+
+          true
+        end
+
+        # Determine any reason to ignore a failure.
+        #
+        # @param [Array<Hash>] exceptions the exceptions associated with the failure.
+        # @return [String] the reason to ignore the exceptions, or `nil` if any exceptions should not be ignored.
+        def ignore_failure_reason(exceptions)
+          exception_classes = exceptions
+            .filter_map { |exception| exception['class'] if IGNORE_EXCEPTIONS.include?(exception['class']) }
+            .compact
+          return if exception_classes.empty? || exception_classes.size < exceptions.size
+
+          msg = exception_classes.many? ? 'the errors were' : 'the error was'
+          "#{msg} #{exception_classes.join(', ')}"
+        end
       end
     end
   end

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

@@ -35,7 +35,7 @@ module Gitlab
           note_posted = note_status(issue, test)
 
           if labels_updated || note_posted
-            puts "Issue updated."
+            puts "Issue updated: #{issue.web_url}"
           else
             puts "Test passed, no results issue update needed."
           end

data/lib/gitlab/qa/runner.rb

@@ -15,6 +15,7 @@ module Gitlab
         Runtime::Scenario.define(:seed_db, false)
         Runtime::Scenario.define(:seed_admin_token, true) # Create an admin access token for root user by default
         Runtime::Scenario.define(:omnibus_exec_commands, [])
+        Runtime::Scenario.define(:skip_server_hooks, false)
 
         # Omnibus Configurators specified by flags
         @active_configurators = []
@@ -37,6 +38,10 @@ module Gitlab
             Runtime::Scenario.define(:seed_admin_token, false)
           end
 
+          opts.on('--skip-server-hooks', 'Skip adding global git server hooks') do
+            Runtime::Scenario.define(:skip_server_hooks, true)
+          end
+
           opts.on('--qa-image QA_IMAGE', String, 'Specifies a QA image to be used instead of inferring it from the GitLab image. See Gitlab::QA::Release#qa_image') do |value|
             Runtime::Scenario.define(:qa_image, value)
           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,12 @@ 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 = Env.log_path
+            ::FileUtils.mkdir_p(log_path) unless File.exist?(log_path)
+
+            TestLogger.logger(level: Env.debug? ? "DEBUG" : 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/scenario/test/sanity/version.rb

@@ -12,22 +12,43 @@ module Gitlab
           # the window defined by the `weekday_hours` method.
           # We perform a single API call to get the commit
           class Version < Scenario::Template
+            SOURCE_MAP = {
+              'git@dev.gitlab.org:gitlab/gitlab-ee.git' => {
+                host: 'dev.gitlab.org',
+                project: 'gitlab/gitlab-ee'
+              },
+              'git@dev.gitlab.org:gitlab/gitlabhq.git' => {
+                host: 'dev.gitlab.org',
+                project: 'gitlab/gitlabhq'
+              },
+              'git@gitlab.com:gitlab-org/gitlab.git' => {
+                host: 'gitlab.com',
+                project: 'gitlab-org/gitlab'
+              },
+              'git@gitlab.com:gitlab-org/gitlab-foss.git' => {
+                host: 'gitlab.com',
+                project: 'gitlab-org/gitlab-foss'
+              }
+            }.freeze
+
             def perform(release = 'ce')
               version = Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.act do
                   pull
-                  sha_version
+                  rails_version
                 end
               end
 
-              project = "gitlab-org/#{QA::Release.new(release).api_project_name}"
-              commit = api_commit_detail(project, version)
+              project = SOURCE_MAP[version[:source]][:project]
+              host = SOURCE_MAP[version[:source]][:host]
+              sha = version[:sha]
+              commit = api_commit_detail(host, project, sha)
 
               if commit_within_hours?(commit['created_at'], weekday_hours(commit['created_at']))
-                puts "Found commit #{version} in recent history of #{project}"
+                puts "Found commit #{sha} in recent history of #{project} on #{host}"
               else
-                puts "Did not find #{version} in recent history of #{project}"
+                puts "Did not find #{sha} in recent history of #{project} on #{host}"
                 exit 1
               end
             end
@@ -51,9 +72,14 @@ module Gitlab
               Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - hours * 60 * 60).utc).to_datetime
             end
 
-            def api_commit_detail(project, commit_id)
-              api = 'https://gitlab.com/api/v4'
-              url = "#{api}/projects/#{CGI.escape(project)}/repository/commits/#{commit_id}"
+            def api_commit_detail(host, project, sha)
+              url = "https://#{host}/api/v4/projects/#{CGI.escape(project)}/repository/commits/#{sha}"
+
+              if host == 'dev.gitlab.org'
+                Runtime::Env.require_qa_dev_access_token!
+
+                url = "#{url}?private_token=#{Runtime::Env.qa_dev_access_token}"
+              end
 
               JSON.parse(Net::HTTP.get(URI(url)))
             end

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.2'
+    VERSION = '7.30.0'
   end
 end

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.2
+  version: 7.30.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -264,6 +264,7 @@ files:
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -409,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