gitlab-qa 10.2.2 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4d6777aac07a8fbb1da706af278b89fa4abc6684b37a828ec8f3b8f0cd6c49
-  data.tar.gz: 2852a0396eb280993b58fcfe91f29b89565ba28c27615d12d9c04883aa2cfdac
+  metadata.gz: fe25be14520a4bf78ee88e0d5bd7e36534d79b32c5734b92b8337736c659b6b2
+  data.tar.gz: c0064bfce6ed145f0e7464ac72f8ca8ddc2c2ae467a956f361645e8443f7546a
 SHA512:
-  metadata.gz: 8592539a7d61dbfd902853a53ad48310fdf216fb455be221d3d55fc27f1327919550844dade5496d003c83b54d9dfec9c4eafc7e78451b84e3d5b700c188f30c
-  data.tar.gz: cd50e445144fb5d2f70f91eb2ef3b0355f2b78c3712722746571703d7d1bcfa34f41e5462e5ddfa92bb13ae9b206662399dad78f3be8cfa7efc9cb7d42a44545
+  metadata.gz: f3df8e960239e908aa0f86b7f6dcac023ce6996aadd3a4e49108cbf6f58876de94946f3d475b0828578ccb04309ca241ea8f8eeb3fa44b760624f4cb33c29b2f
+  data.tar.gz: 0af92a24612916090ae9a71aebef586b3261a6f99c5cd93f287199881f1f959e897bc68811f8fdb86fc607539bb4998839b6420233d300b1ceca6a3005fa7573

data/Gemfile.lock

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

data/docs/running_against_remote_grid.md

@@ -9,12 +9,17 @@ I.e, if you have a Selenium server set up at http://localhost:4444 or if you hav
 | Variable                  | Description                                                    | Default  | Example(s)                     |
 |---------------------------|----------------------------------------------------------------|----------|--------------------------------|
 | QA_BROWSER                | Browser to run against                                         | "chrome" | "chrome" "firefox" "safari"    |
+| QA_BROWSER_VERSION        | Version of browser to run against                              | "latest" | "latest" "111.0" "mobile-111.0"|
 | QA_REMOTE_GRID_PROTOCOL   | Protocol to use                                                | "http"   | "http" "https"                 |
-| QA_REMOTE_GRID            | Remote grid to run tests against                               |          | "localhost:3000" "provider:80" |
-| QA_REMOTE_GRID_USERNAME   | Username to specify in the remote grid. "USERNAME@provider:80" |          | "gitlab-sl"                    |
-| QA_REMOTE_GRID_ACCESS_KEY | Key/Token paired with `QA_REMOTE_GRID_USERNAME`                |          |                                |
-| QA_REMOTE_TUNNEL_ID       | Name of the remote tunnel to use                               | "gitlab-sl_tunnel_id" |                                |
-| QA_REMOTE_MOBILE_DEVICE_NAME | Name of mobile device to test against. `QA_BROWSER` must be set to `safari` for iOS devices and `chrome` for Android devices.                                                |          | "iPhone 12 Simulator"          |
+| QA_REMOTE_GRID            | Remote grid to run tests against                               |          | "localhost:3000" "provider:80" "selenoid:4444" |
+| QA_LAYOUT                 | Used with Selenoid. Tells test nav to expect collapsed menus. "phone" expects collapsed top and left nav bars, "tablet" expects collapsed left nav bar only. |          | "phone", "tablet"              |
+| SELENOID_DIRECTORY        | Used with Selenoid. Directory to save videos to                | "<host_artifacts_dir>/selenoid" |        |
+| USE_SELENOID              | Used with Selenoid. Sets up selenoid containers.               | false    | false, true                    |
+| QA_RECORD_VIDEO           | Used with Selenoid. Triggers video recording.                  | false    | false, true                    |
+| QA_REMOTE_GRID_USERNAME   | Used with Sauce Labs. Username to specify in the remote grid. "USERNAME@provider:80" |          | "gitlab-sl"                    |
+| QA_REMOTE_GRID_ACCESS_KEY | Used with Sauce Labs. Key/Token paired with `QA_REMOTE_GRID_USERNAME` |          |                                |
+| QA_REMOTE_TUNNEL_ID       | Used with Sauce Labs. Name of the remote tunnel to use         | "gitlab-sl_tunnel_id" |                                |
+| QA_REMOTE_MOBILE_DEVICE_NAME | Used with Sauce Labs. Name of mobile device to test against. `QA_BROWSER` must be set to `safari` for iOS devices and `chrome` for Android devices. |          | "iPhone 12 Simulator"          |
 
 ## Testing with Sauce Labs
 

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/fixtures/selenoid/browsers.json

@@ -0,0 +1,25 @@
+{
+  "chrome": {
+    "default": "111.0",
+    "versions": {
+      "111.0": {
+        "image": "selenoid/chrome:111.0",
+        "port": "4444"
+      },
+      "mobile-111.0": {
+        "image": "registry.gitlab.com/gitlab-org/gitlab-qa/selenoid-chrome-gitlab:mobile-111.0",
+        "path": "/wd/hub",
+        "port": "4444"
+      }
+    }
+  },
+  "MicrosoftEdge": {
+    "default": "111.0",
+    "versions": {
+      "111.0": {
+        "image": "browsers/edge:111.0",
+        "port": "4444"
+      }
+    }
+  }
+}

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'http'
+
+module Gitlab
+  module QA
+    module Component
+      # Component for the Selenoid Grid
+      # https://aerokube.com/selenoid/latest/
+      class Selenoid < Base
+        DOCKER_IMAGE = 'aerokube/selenoid'
+        DOCKER_IMAGE_TAG = 'latest-release'
+
+        def name
+          @name ||= 'selenoid'
+        end
+
+        def instance
+          Runtime::Env.webdriver_headless = '0'
+          Runtime::Env.chrome_disable_dev_shm = 'true'
+          Runtime::Env.remote_grid = "#{hostname}:4444"
+          Runtime::Env.remote_grid_protocol = 'http'
+          raise 'Please provide a block!' unless block_given?
+
+          super
+        end
+
+        def start
+          pull_images
+          docker.run(image: image, tag: tag, args: ['-container-network', network]) do |command|
+            set_command_args(command)
+            set_volumes(command)
+          end
+        end
+
+        def wait_until_ready(max_attempts: 20, wait: 2)
+          Runtime::Logger.info("Waiting for Selenoid ...")
+
+          max_attempts.times do
+            return Runtime::Logger.info("Selenoid ready!") if grid_healthy?
+
+            sleep wait
+          end
+
+          raise "Retried #{max_attempts} times. Selenoid is not responding. Aborting."
+        end
+
+        private
+
+        def grid_healthy?
+          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") if Runtime::Env.record_video
+        end
+
+        # Set custom run command arguments
+        #
+        # @param [Docker::Command] command
+        # @return [void]
+        def set_command_args(command)
+          command << '-d '
+          command << "--name #{name}"
+          command << "--net #{network}"
+          command << "--hostname #{hostname}"
+          command << "--publish 4444:4444"
+          command << "-e OVERRIDE_VIDEO_OUTPUT_DIR=#{Runtime::Env.selenoid_directory}/video"
+        end
+
+        # Set volumes
+        #
+        # @param [Docker::Command] command
+        # @return [void]
+        def set_volumes(command)
+          command.volume('/var/run/docker.sock', '/var/run/docker.sock')
+          command.volume("#{__dir__}/../../../../fixtures/selenoid", "/etc/selenoid")
+          command.volume("#{Runtime::Env.selenoid_directory}/video", '/opt/selenoid/video')
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 # rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
 
@@ -27,6 +28,19 @@ module Gitlab
         end
 
         def perform
+          if Runtime::Env.use_selenoid?
+            Component::Selenoid.perform do |selenoid|
+              selenoid.network = network
+              selenoid.instance do
+                internal_perform
+              end
+            end
+          else
+            internal_perform
+          end
+        end
+
+        def internal_perform
           return Runtime::Logger.info("Skipping tests.") if skip_tests?
 
           raise ArgumentError unless [suite, release].all?
@@ -114,3 +128,4 @@ module Gitlab
   end
 end
 # rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/AbcSize

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,
@@ -41,6 +44,7 @@ module Gitlab
           'QA_INFLUXDB_TOKEN' => :qa_influxdb_token,
           'QA_SKIP_PULL' => :qa_skip_pull,
           'QA_VALIDATE_RESOURCE_REUSE' => :qa_validate_resource_reuse,
+          'WEBDRIVER_HEADLESS' => :webdriver_headless,
           'GITLAB_API_BASE' => :api_base,
           'GITLAB_ADMIN_USERNAME' => :admin_username,
           'GITLAB_ADMIN_PASSWORD' => :admin_password,
@@ -148,7 +152,9 @@ module Gitlab
           'RELEASE' => :release,
           'RELEASE_REGISTRY_URL' => :release_registry_url,
           'RELEASE_REGISTRY_USERNAME' => :release_registry_username,
-          'RELEASE_REGISTRY_PASSWORD' => :release_registry_password
+          'RELEASE_REGISTRY_PASSWORD' => :release_registry_password,
+          'SELENOID_DIRECTORY' => :selenoid_directory,
+          'USE_SELENOID' => :use_selenoid
         }.freeze
 
         ENV_VARIABLES.each do |env_name, method_name|
@@ -349,6 +355,18 @@ module Gitlab
           enabled?(env_var_value_if_defined('QA_EXPORT_TEST_METRICS'), default: true)
         end
 
+        def selenoid_directory
+          env_var_value_if_defined('SELENOID_DIRECTORY') || "#{host_artifacts_dir}/selenoid"
+        end
+
+        def use_selenoid?
+          enabled?(env_var_value_if_defined('USE_SELENOID'), default: false)
+        end
+
+        def mobile_layout?
+          env_var_value_if_defined('QA_LAYOUT')&.match?(/tablet|phone/i)
+        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/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '10.2.2'
+    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.2.2
+  version: 10.4.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -360,6 +360,7 @@ files:
 - fixtures/ldap/2_add_users.ldif
 - fixtures/ldap/3_add_groups.ldif
 - fixtures/ldap/tanuki.ldif
+- fixtures/selenoid/browsers.json
 - gitlab-qa.gemspec
 - lefthook.yml
 - lib/gitlab/qa.rb
@@ -382,6 +383,7 @@ files:
 - lib/gitlab/qa/component/production.rb
 - lib/gitlab/qa/component/release.rb
 - lib/gitlab/qa/component/saml.rb
+- lib/gitlab/qa/component/selenoid.rb
 - lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/component/staging_ref.rb