gitlab-qa 7.33.0 → 7.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e445e804d4da01a171e7ff5287ca8b39d8cdc9bbfa25a0ba05e0a8c60356fc19
-  data.tar.gz: 75193391112311339c90b9d16bbf74575b18bffb69bb07126a670aecdef6743b
+  metadata.gz: 917c47b2fbead3c77db3cd6c441995a8324ed73735262542dcd94de854022a35
+  data.tar.gz: 7785db11c9eb0f1f7ff2ecf32b16b8fd95ad9bab9391711f2d0af05a7e903153
 SHA512:
-  metadata.gz: 8d1c61664ca82330fc8a05c563fda8ec7037dee724b0dd6c140870f033b9f4e17281aaba0aa7eb4607ca9c7d67874d66a1f1f98520d47660a42417a4dc9df74b
-  data.tar.gz: '0369df333021790180d99307aed50ebc146613ed70ad26ecf4b59b2312c18cdddbe01f7221399221df014c30de87ce050a5a21bc7652d875aad34421390aac56'
+  metadata.gz: c509e252f4bd1e7d405d517920e306e2cdf5233cd73a5fbf25a878cbb863a7c21e5fedb007c8ef461f7e34e1899b27ff989d92182c427575a125f4c99a39de9d
+  data.tar.gz: 9011ddab65c7c0218ed49a5cbd2cdaa26f2b2ce013eb005d9ba63ee067ce18306bf8475861156ca52d7e2272cc9c94588ac86016e90e7901ecdac94d4e2f6cbf

data/Gemfile.lock

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

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

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

metadata

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