gitlab-qa 7.27.1 → 7.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08b53ffc75578165d38ea6c735882e0fdf9059ece88c1aa91ecdac67df8fa1d
-  data.tar.gz: 35091d5ab69c1a88a21ffe839c73d7fc23744517e28f4d6d193c92a7c1bb3252
+  metadata.gz: 888a15b623b94cf6a072af7edf18d11952ff971a661d1fd4d154b28a627c9509
+  data.tar.gz: c5e6cb25a0ecda8f4237186249ec44b246254df78b26e1372569500c00901c6c
 SHA512:
-  metadata.gz: 56119714620bfa55ed88e9136d4e5a35e72606996c6bab5e0a613ea16e14653dc50055a54cc4302d26dbd01ceb614ebbf85bca1d8237ffc5f402e36586e6e37e
-  data.tar.gz: 47ba7c6b6603cc8982b5fb5a54732550d13c40eea076f0fd46054a104093c2c97016d3e84a468e073e925ed1633f83085414667740230a2b6511ce2d3836b9c8
+  metadata.gz: 17a2b9f2863cf42a36f5e72e39a90b17ad00367be81ec2f5e61b35299086e470f227d46c5e1b186abb52c49bab82d6289010a0e4e1410f74d51e779a1cfadec0
+  data.tar.gz: cfb21124fbd588d157ce8f93fb83300fdb521ddfbfde2e1fd4853aa966cf418075607496671aa5a739656d33acead7524e607076945b305279fa4db94d61a80c

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

@@ -10,6 +10,7 @@ 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:
@@ -23,3 +24,4 @@ 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.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/docs/what_tests_can_be_run.md

@@ -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.

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

@@ -176,6 +176,7 @@ module Gitlab
 
           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
 
           Runtime::Logger.info("Running exec_commands...")
           exec_commands.flatten.uniq.each { |command| @docker.exec(name, command) }

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/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/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.27.1'
+    VERSION = '7.27.2'
   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

@@ -34,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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.27.1
+  version: 7.27.2
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -218,7 +218,6 @@ 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"
@@ -364,7 +363,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

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