gitlab-qa 7.31.0 → 7.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 950731b29895b80ed3a174ade472d58c7496fc60620959224790f007a0beff79
-  data.tar.gz: 66d92f34024e8c9a4b679424c0f1994713ac7180eadd875f732d8c4d8f741a9b
+  metadata.gz: 917c47b2fbead3c77db3cd6c441995a8324ed73735262542dcd94de854022a35
+  data.tar.gz: 7785db11c9eb0f1f7ff2ecf32b16b8fd95ad9bab9391711f2d0af05a7e903153
 SHA512:
-  metadata.gz: fab55c1cfbcaa92e9b24156a61d1314e28565be51c1d0e06387445554f25dd1f170f192d2784a2d1bd40d7ff28de484ceba9830bcb16dd1d792a11c2253171c8
-  data.tar.gz: 663d5d28fa646a0b19ac84b292b61879b8ebc238657d99928d10ffee995dfc12dd56419cfbdd5cf1b9384c665dc6e54cedde4136c2b32fd4810982821f2cd4af
+  metadata.gz: c509e252f4bd1e7d405d517920e306e2cdf5233cd73a5fbf25a878cbb863a7c21e5fedb007c8ef461f7e34e1899b27ff989d92182c427575a125f4c99a39de9d
+  data.tar.gz: 9011ddab65c7c0218ed49a5cbd2cdaa26f2b2ce013eb005d9ba63ee067ce18306bf8475861156ca52d7e2272cc9c94588ac86016e90e7901ecdac94d4e2f6cbf

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

@@ -71,7 +71,6 @@ 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/cloud_activation.gitlab-ci.yml

@@ -11,7 +11,7 @@ ee:cloud-activation:
     - .combined-gitlab-qa-options-script
   variables:
     QA_RSPEC_TAGS: "--tag cloud_activation"
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --no-admin-token --seed-db license*.rb"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --seed-db license*.rb"
 
 ee:cloud-activation-quarantine:
   before_script:
@@ -27,4 +27,4 @@ ee:cloud-activation-quarantine:
     - .combined-gitlab-qa-options-script
   variables:
     QA_RSPEC_TAGS: "--tag cloud_activation"
-    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --no-admin-token --seed-db license*.rb"
+    GITLAB_QA_OPTIONS_COMBINED: "$GITLAB_QA_OPTIONS --seed-db license*.rb"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (7.31.0)
+    gitlab-qa (7.34.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

data/docs/what_tests_can_be_run.md

@@ -68,7 +68,8 @@ 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. By default `QA_ARTIFACTS_DIR` is used | No|
+| `QA_LOG_LEVEL` | `info` | Logging level to use for gitlab-qa output and qa tests output | No|
+| `QA_LOG_PATH` | `QA_ARTIFACTS_DIR` | Path to output debug logging to. | 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|

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

@@ -115,7 +115,7 @@ module Gitlab
               end
 
               exception['message'].gsub!(/(private_token=)[\w-]+/, '********')
-              exception['message_lines'].each { |line| line.gsub!(/(private_token=)([\w-]+)/, '********') }
+              Array(exception['message_lines']).each { |line| line.gsub!(/(private_token=)([\w-]+)/, '********') }
 
               {
                 'message' => "#{exception['class']}: #{exception['message']}",

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

@@ -16,7 +16,7 @@ module Gitlab
             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)
+            TestLogger.logger(level: Env.log_level, path: log_path)
           end
         end
       end

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

@@ -20,28 +20,14 @@ module Gitlab
             end
 
             def perform(release, *rspec_args)
-              gitaly_primary_node = gitaly(@primary_node_name, release)
-              gitaly_secondary_node = gitaly(@secondary_node_name, release)
-              gitaly_tertiary_node = gitaly(@tertiary_node_name, release)
-
-              sql_node = Component::PostgreSQL.new.tap do |sql|
-                sql.name = @database
-                sql.network = @network
-                sql.instance(skip_teardown: true) do
-                  sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
-                end
-              end
-
-              praefect_node = Component::Gitlab.new.tap do |praefect|
-                praefect.release = QA::Release.new(release)
-                praefect.name = @praefect_node_name
-                praefect.network = @network
-                praefect.skip_availability_check = true
-                praefect.seed_admin_token = false
-
-                praefect.omnibus_configuration << praefect_omnibus_configuration
-
-                praefect.instance(skip_teardown: true)
+              # The postgres container starts in seconds so not essential to parallelize it
+              # This also ensure that the docker network is created here, avoiding any potential race conditions later
+              #  if the gitaly-cluster and GitLab containers attempt to create a network in parallel
+              @sql_node = postgres
+
+              gitaly_cluster = Thread.new do
+                Thread.current.abort_on_exception = true
+                start_gitaly_cluster(release)
               end
 
               Component::Gitlab.perform do |gitlab|
@@ -51,6 +37,8 @@ module Gitlab
 
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
                 gitlab.instance do
+                  # Wait for gitaly cluster to finish booting, before attempting to run specs
+                  gitaly_cluster.join
                   Runtime::Logger.info('Running Gitaly Cluster specs!')
 
                   if @tag
@@ -68,15 +56,25 @@ module Gitlab
                 end
               end
             ensure
-              praefect_node&.teardown
-              sql_node&.teardown
-              gitaly_primary_node&.teardown
-              gitaly_secondary_node&.teardown
-              gitaly_tertiary_node&.teardown
+              @praefect_node&.teardown
+              @sql_node&.teardown
+              @gitaly_primary_node&.teardown
+              @gitaly_secondary_node&.teardown
+              @gitaly_tertiary_node&.teardown
             end
 
             private
 
+            def start_gitaly_cluster(release)
+              Runtime::Logger.info("Starting Gitaly Cluster")
+              @gitaly_primary_node = gitaly(@primary_node_name, release)
+              @gitaly_secondary_node = gitaly(@secondary_node_name, release)
+              @gitaly_tertiary_node = gitaly(@tertiary_node_name, release)
+
+              @praefect_node = praefect(@praefect_node_name, release)
+              Runtime::Logger.info("Gitaly Cluster Ready")
+            end
+
             def disable_other_services
               <<~OMNIBUS
                 postgresql['enable'] = false;
@@ -191,6 +189,30 @@ module Gitlab
               OMNIBUS
             end
 
+            def praefect(name, release)
+              Component::Gitlab.new.tap do |praefect|
+                praefect.release = QA::Release.new(release)
+                praefect.name = name
+                praefect.network = @network
+                praefect.skip_availability_check = true
+                praefect.seed_admin_token = false
+
+                praefect.omnibus_configuration << praefect_omnibus_configuration
+
+                praefect.instance(skip_teardown: true)
+              end
+            end
+
+            def postgres
+              Component::PostgreSQL.new.tap do |sql|
+                sql.name = @database
+                sql.network = @network
+                sql.instance(skip_teardown: true) do
+                  sql.run_psql '-d template1 -c "CREATE DATABASE praefect_production OWNER postgres"'
+                end
+              end
+            end
+
             def gitaly(name, release)
               Component::Gitlab.new.tap do |gitaly|
                 gitaly.release = QA::Release.new(release)

data/lib/gitlab/qa/test_logger.rb

@@ -68,12 +68,13 @@ module Gitlab
 
         # Log message prefix
         #
+        # @note when outputted, the date will be formatted as "Jun 07 2022 11:30:00 UTC"
         # @param [DateTime] date
         # @param [String] source
         # @param [String] severity
         # @return [String]
         def message_prefix(date, source, severity)
-          "[date=#{date} from=#{source}] #{severity.ljust(5)} -- "
+          "[#{date.strftime('%h %d %Y %H:%M:%S %Z')} (#{source})] #{severity.ljust(5)} -- "
         end
       end
     end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.31.0'
+    VERSION = '7.34.0'
   end
 end

data/support/data/license_usage_seed.rb

@@ -51,6 +51,7 @@ class LicenseUsageSeed
     roles = Gitlab::Access.values
 
     GroupMember.create(user_id: user.id, access_level: roles.sample, source_id: group_id)
+    Users::UpdateHighestMemberRoleService.new(user).execute
   end
 
   def self.seed_users

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.31.0
+  version: 7.34.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control