gitlab-qa 10.3.0.1 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc87eff61f4ee1948666c002738047c9061df3f669c16b87a78887b68776f3c
-  data.tar.gz: 32514740f5d1cc8403d6b388c731048d85e5da441acaf687d7f8ddad72ad44a6
+  metadata.gz: fe25be14520a4bf78ee88e0d5bd7e36534d79b32c5734b92b8337736c659b6b2
+  data.tar.gz: c0064bfce6ed145f0e7464ac72f8ca8ddc2c2ae467a956f361645e8443f7546a
 SHA512:
-  metadata.gz: 29a26e723aac6ac6fad94630e0e5dfe1882aa7031474dcd20f781468105dfa77f6449430202f06875a400edbc71339c0eb4183303bd3cddd432105241ce1bafc
-  data.tar.gz: '08751aa4982005a4ac8b80998dd07ae31a4fb08c6a4539a20c09167ab382a7bed47a6c5b74478ed30bb6db05c91c2258e11d753774b4fe9d0d6b1c36ac592462'
+  metadata.gz: f3df8e960239e908aa0f86b7f6dcac023ce6996aadd3a4e49108cbf6f58876de94946f3d475b0828578ccb04309ca241ea8f8eeb3fa44b760624f4cb33c29b2f
+  data.tar.gz: 0af92a24612916090ae9a71aebef586b3261a6f99c5cd93f287199881f1f959e897bc68811f8fdb86fc607539bb4998839b6420233d300b1ceca6a3005fa7573

data/.gitlab-ci.yml

@@ -34,7 +34,7 @@ workflow:
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'
     # For the default branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
-    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     # 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.
@@ -46,12 +46,6 @@ variables:
   BUNDLE_SILENCE_ROOT_WARNING: "true"
   BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
 
-# Override rules to allow creating backport releases
-.release-base:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable$/)'
-      changes: ["lib/**/version.rb"]
-
 package-and-test-env:
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:latest
   stage: .pre

data/Gemfile.lock

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

data/docs/what_tests_can_be_run.md

@@ -1072,7 +1072,10 @@ gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
 
 ### `Test::Instance::Image EE --omnibus-config decomposition_single_db`
 
-This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using a single database:
+**Note: The default Omnibus config is using a single database
+with [two database connections](https://docs.gitlab.com/omnibus/settings/database.html#configuring-multiple-database-connections)**
+
+This scenario is to run tests against a GitLab instance using a single database with only one `main` connection:
 
 ```ruby
 gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_single_db
@@ -1080,7 +1083,7 @@ gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_single_db
 
 ### `Test::Instance::Image EE --omnibus-config decomposition_multiple_db`
 
-This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using multiple databases:
+This scenario is to run tests against a GitLab instance using [multiple databases](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html):
 
 ```ruby
 gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_multiple_db

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

@@ -64,9 +64,11 @@ module Gitlab
             praefect['enable'] = false;
             prometheus['enable'] = true;
             gitaly['enable'] = true;
-            gitaly['listen_addr'] = '0.0.0.0:#{gitaly_port}';
-            gitaly['prometheus_listen_addr'] = '0.0.0.0:9236';
-            gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN';
+            gitaly['configuration'] = {
+              'listen_addr': '0.0.0.0:#{gitaly_port}',
+              'prometheus_listen_addr': '0.0.0.0:9236',
+              'auth_token': 'PRAEFECT_INTERNAL_TOKEN'
+            }
             gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN';
             gitlab_rails['internal_api_url'] = 'http://#{cluster_config.gitlab_name}.#{cluster_config.network}';
             git_data_dirs({

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

@@ -60,36 +60,46 @@ module Gitlab
               gitaly['enable'] = false;
               prometheus['enable'] = true;
               praefect['enable'] = true;
-              praefect['listen_addr'] = '0.0.0.0:#{cluster_config.praefect_port}';
-              praefect['prometheus_listen_addr'] = '0.0.0.0:9652';
-              praefect['auth_token'] = 'PRAEFECT_EXTERNAL_TOKEN';
-              praefect['reconciliation_scheduling_interval'] = '10s';
-              praefect['database_host'] = '#{cluster_config.database_node_addr}';
-              praefect['database_user'] = 'postgres';
-              praefect['database_port'] = #{cluster_config.database_port};
-              praefect['database_password'] = 'SQL_PASSWORD';
-              praefect['database_dbname'] = 'praefect_production';
-              praefect['database_sslmode'] = 'disable';
-              praefect['database_direct_host'] = '#{cluster_config.database_node_addr}';
-              praefect['database_direct_port'] = #{cluster_config.database_port};
-              praefect['virtual_storages'] = {
-                'default' => {
-                  'nodes' => {
-                    '#{cluster_config.primary_node_name}' => {
-                      'address' => 'tcp://#{cluster_config.primary_node_addr}:#{cluster_config.primary_node_port}',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    },
-                    '#{cluster_config.secondary_node_name}' => {
-                      'address' => 'tcp://#{cluster_config.secondary_node_addr}:#{cluster_config.secondary_node_port}',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    },
-                    '#{cluster_config.tertiary_node_name}' => {
-                      'address' => 'tcp://#{cluster_config.tertiary_node_addr}:#{cluster_config.tertiary_node_port}',
-                      'token'   => 'PRAEFECT_INTERNAL_TOKEN'
-                    }
+              praefect['configuration'] = {
+                listen_addr: '0.0.0.0:#{cluster_config.praefect_port}',
+                prometheus_listen_addr: '0.0.0.0:9652',
+                auth: {
+                  token: 'PRAEFECT_EXTERNAL_TOKEN'
+                },
+                reconciliation: {
+                  scheduling_interval: '10s'
+                },
+                database: {
+                  host: '#{cluster_config.database_node_addr}',
+                  port: #{cluster_config.database_port},
+                  user: 'postgres',
+                  password: 'SQL_PASSWORD',
+                  dbname: 'praefect_production',
+                  sslmode: 'disable'
+                },
+                virtual_storage: [
+                  {
+                    name: 'default',
+                    node: [
+                      {
+                        'storage': '#{cluster_config.primary_node_name}',
+                        'address': 'tcp://#{cluster_config.primary_node_addr}:#{cluster_config.primary_node_port}',
+                        'token': 'PRAEFECT_INTERNAL_TOKEN'
+                      },
+                      {
+                        'storage': '#{cluster_config.secondary_node_name}',
+                        'address': 'tcp://#{cluster_config.secondary_node_addr}:#{cluster_config.secondary_node_port}',
+                        'token': 'PRAEFECT_INTERNAL_TOKEN'
+                      },
+                      {
+                        'storage': '#{cluster_config.tertiary_node_name}',
+                        'address': 'tcp://#{cluster_config.tertiary_node_addr}:#{cluster_config.tertiary_node_port}',
+                        'token': 'PRAEFECT_INTERNAL_TOKEN'
+                      }
+                    ],
                   }
-                }
-              };
+                ]
+              }
           OMNIBUS
         end
       end

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

@@ -31,8 +31,6 @@ module Gitlab
             set_command_args(command)
             set_volumes(command)
           end
-
-          wait_until_ready
         end
 
         def wait_until_ready(max_attempts: 20, wait: 2)
@@ -50,14 +48,15 @@ module Gitlab
         private
 
         def grid_healthy?
-          HTTP.get('http://localhost:4444/ping').status&.success?
-        rescue HTTP::ConnectionError => _e
+          HTTP.get('http://docker:4444/ping').status&.success?
+        rescue HTTP::ConnectionError => e
+          Runtime::Logger.debug(e)
           false
         end
 
         def pull_images
-          docker.pull(image: "selenoid/chrome", tag: Runtime::Env.browser_version) if Runtime::Env.browser == :chrome && !Runtime::Env.mobile_layout?
-          docker.pull(image: "selenoid/video-recorder", tag: "latest-release")
+          docker.pull(image: "selenoid/chrome", tag: Runtime::Env.browser_version) if Runtime::Env.browser == 'chrome' && !Runtime::Env.mobile_layout?
+          docker.pull(image: "selenoid/video-recorder", tag: "latest-release") if Runtime::Env.record_video
         end
 
         # Set custom run command arguments

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

@@ -22,6 +22,9 @@ module Gitlab
           'QA_REMOTE_MOBILE_DEVICE_NAME' => :remote_mobile_device_name,
           'QA_REMOTE_TUNNEL_ID' => :remote_tunnel_id,
           'QA_BROWSER' => :browser,
+          'QA_BROWSER_VERSION' => :browser_version,
+          'QA_RECORD_VIDEO' => :record_video,
+          'QA_LAYOUT' => :layout,
           'QA_ADDITIONAL_REPOSITORY_STORAGE' => :qa_additional_repository_storage,
           'QA_PRAEFECT_REPOSITORY_STORAGE' => :qa_praefect_repository_storage,
           'QA_GITALY_NON_CLUSTER_STORAGE' => :qa_gitaly_non_cluster_storage,
@@ -364,10 +367,6 @@ module Gitlab
           env_var_value_if_defined('QA_LAYOUT')&.match?(/tablet|phone/i)
         end
 
-        def browser_version
-          env_var_value_if_defined('QA_BROWSER_VERSION')
-        end
-
         def qa_run_type
           return env_var_value_if_defined('QA_RUN_TYPE') if env_var_value_valid?('QA_RUN_TYPE')
 

data/lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb

@@ -8,8 +8,7 @@ module Gitlab
           def configuration
             <<~OMNIBUS
               gitlab_rails['databases']['main']['enable'] = true
-              gitlab_rails['databases']['ci']['enable'] = true
-              gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
+              gitlab_rails['databases']['ci']['enable'] = false
             OMNIBUS
           end
         end

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

@@ -47,10 +47,6 @@ module Gitlab
 
         private
 
-        MAX_TAGS_HTTP_REQUESTS = 50
-        # https://docs.docker.com/docker-hub/api/latest/#tag/images/operation/GetNamespacesRepositoriesImages
-        TAGS_PER_PAGE = 100
-
         attr_reader :current_version, :edition, :logger
 
         # Current versions major version
@@ -159,44 +155,28 @@ module Gitlab
         # All available docker tags
         #
         # @return [Array<String>]
+        # rubocop:disable Metrics/AbcSize
         def tags
           return @tags if defined?(@tags)
 
-          MAX_TAGS_HTTP_REQUESTS.times do |index|
-            tag_list, more_data = fetch_tags(page: index + 1)
-
-            if tag_list
-              @tags = Array(@tags)
-              @tags += tag_list
-            end
-
-            break if tag_list.nil? || more_data.nil?
-          end
-
-          @tags
-        end
-
-        def fetch_tags(page:, per_page: TAGS_PER_PAGE)
-          logger.info("Fetching Docker tags page #{page} from 'gitlab/gitlab-#{edition}' registry")
+          logger.info("Fetching docker tags from 'gitlab/gitlab-#{edition}' registry")
           response = HttpRequest.make_http_request(
-            url: "https://registry.hub.docker.com/v2/namespaces/gitlab/repositories/gitlab-#{edition}/tags?page=#{page}&page_size=#{per_page}",
+            url: "https://registry.hub.docker.com/v2/namespaces/gitlab/repositories/gitlab-#{edition}/tags?page_size=1000",
             fail_on_error: false
           )
 
           unless response.code == 200
             logger.error("  failed to fetch docker tags - code: #{response.code}, response: '#{response.body}'")
-            return nil
+            return @tags = nil
           end
 
-          response = JSON.parse(response.body, symbolize_names: true)
-          matching_tags = response
+          @tags = JSON
+            .parse(response.body, symbolize_names: true)
             .fetch(:results)
             .map { |tag| tag[:name] }
-            .grep(VERSION_PATTERN)
-          more_data = response.fetch(:next)
-
-          [matching_tags, more_data]
+            .select { |tag| tag.match?(VERSION_PATTERN) }
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '10.3.0.1'
+    VERSION = '10.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 10.3.0.1
+  version: 10.4.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control