gitlab-qa 7.32.0 → 7.35.0

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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/object/blank'
 require 'securerandom'
-require 'rainbow/refinement'
 
 module Gitlab
   module QA
@@ -142,7 +143,9 @@ module Gitlab
           attr_writer(method_name)
 
           define_method(method_name) do
-            env_var_value_if_defined(env_name) || (instance_variable_get("@#{method_name}") if instance_variable_defined?("@#{method_name}"))
+            env_var_value_if_defined(env_name) || (if instance_variable_defined?("@#{method_name}")
+                                                     instance_variable_get("@#{method_name}")
+                                                   end)
           end
         end
 
@@ -220,11 +223,13 @@ module Gitlab
         end
 
         def host_artifacts_dir
-          @host_artifacts_dir ||= File.join(env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id)
+          @host_artifacts_dir ||= File.join(
+            env_var_value_if_defined('QA_ARTIFACTS_DIR') || '/tmp/gitlab-qa', Runtime::Env.run_id
+          )
         end
 
         def elastic_version
-          env_var_value_if_defined('ELASTIC_VERSION') || '7.17.0'.freeze
+          env_var_value_if_defined('ELASTIC_VERSION') || '7.17.0'
         end
 
         def require_license!

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/cli_commands.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario
       module CLICommands
-        GIT_LFS_VERSION = '2.8.0'.freeze
+        GIT_LFS_VERSION = '2.8.0'
 
         def self.git_lfs_install_commands
           [

data/lib/gitlab/qa/scenario/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/airgapped.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/any.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/deployment_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/preprod.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/relative_url.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/release.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/repository_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/smoke.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_ref.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario
@@ -20,28 +22,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 +39,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 +58,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 +191,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/scenario/test/integration/group_saml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab
@@ -8,12 +10,12 @@ module Gitlab
           class LDAP < Scenario::Template
             LDAP_PORT = 389
             LDAP_TLS_PORT = 636
-            BASE_DN = 'dc=example,dc=org'.freeze
-            BIND_DN = 'cn=admin,dc=example,dc=org'.freeze
-            GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'.freeze
-            ADMIN_GROUP = 'AdminGroup'.freeze
-            ADMIN_USER = 'admin'.freeze
-            ADMIN_PASSWORD = 'admin'.freeze
+            BASE_DN = 'dc=example,dc=org'
+            BIND_DN = 'cn=admin,dc=example,dc=org'
+            GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'
+            ADMIN_GROUP = 'AdminGroup'
+            ADMIN_USER = 'admin'
+            ADMIN_PASSWORD = 'admin'
 
             attr_reader :gitlab_name, :spec_suite, :tls, :ldap_name, :network, :orchestrate_ldap_server
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Gitlab

data/lib/gitlab/qa/scenario/test/omnibus/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Scenario

data/lib/gitlab/qa/scenario/test/omnibus/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'fileutils'
 

data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'fileutils'
 

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'net/http'
 require 'cgi'

data/lib/gitlab/qa/slack/post_to_slack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Slack

data/lib/gitlab/qa/support/dev_ee_qa_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'uri'
 
@@ -7,7 +9,7 @@ module Gitlab
       class DevEEQAImage
         attr_reader :base_url
 
-        DEV_ADDRESS = 'https://dev.gitlab.org'.freeze
+        DEV_ADDRESS = 'https://dev.gitlab.org'
         GITLAB_EE_QA_REPOSITORY_ID = 55
         QAImageNotFoundError = Class.new(StandardError)
 

data/lib/gitlab/qa/support/get_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 

data/lib/gitlab/qa/support/http_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http'
 require 'json'
 

data/lib/gitlab/qa/support/invalid_response_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gitlab
   module QA
     module Support

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.32.0'
+    VERSION = '7.35.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'rainbow/refinement'
+
 module Gitlab
   module QA
     autoload :Release, 'gitlab/qa/release'

data/scripts/generate-qa-jobs.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'yaml'
 

data/support/data/license_usage_seed.rb

@@ -48,7 +48,8 @@ class LicenseUsageSeed
   end
 
   def self.create_member(user, group_id)
-    roles = Gitlab::Access.values
+    # Excludes GUEST role based on ultimate license seat count
+    roles = [Gitlab::Access::REPORTER, Gitlab::Access::DEVELOPER, Gitlab::Access::MAINTAINER]
 
     GroupMember.create(user_id: user.id, access_level: roles.sample, source_id: group_id)
     Users::UpdateHighestMemberRoleService.new(user).execute

metadata

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