gitlab-qa 10.3.0 → 12.2.1

data/gitlab-qa.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['GitLab Quality']
   spec.email         = ['gitlab-qa@gmail.com']
 
+  spec.required_ruby_version = ">= 3.0.0"
+
   spec.summary       = 'Integration tests for GitLab'
   spec.homepage      = 'http://about.gitlab.com/'
   spec.license       = 'MIT'
@@ -22,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'climate_control', '~> 1.0.1'
   spec.add_development_dependency 'gitlab-dangerfiles', '~> 2.11'
-  spec.add_development_dependency 'gitlab-styles', '~> 6.2.1'
+  spec.add_development_dependency 'gitlab-styles', '~> 10'
   spec.add_development_dependency 'lefthook', '~> 1.2.6'
   spec.add_development_dependency 'pry', '~> 0.11'
   spec.add_development_dependency 'rake', '~> 13.0'
@@ -33,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'timecop', '~> 0.9.5'
   spec.add_development_dependency 'webmock', '3.7.0'
 
-  spec.add_runtime_dependency 'activesupport', '~> 6.1'
-  spec.add_runtime_dependency 'gitlab', '~> 4.18.0'
+  spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.1'
+  spec.add_runtime_dependency 'gitlab', '~> 4.19'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
   spec.add_runtime_dependency 'parallel', '>= 1', '< 2'

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

@@ -11,13 +11,13 @@ module Gitlab
         attr_reader :docker
         attr_writer :name, :exec_commands
         attr_accessor :volumes,
-                      :ports,
-                      :network,
-                      :network_aliases,
-                      :environment,
-                      :runner_network,
-                      :airgapped_network,
-                      :additional_hosts
+          :ports,
+          :network,
+          :network_aliases,
+          :environment,
+          :runner_network,
+          :airgapped_network,
+          :additional_hosts
 
         def initialize
           @docker = Docker::Engine.new
@@ -42,13 +42,13 @@ module Gitlab
         end
 
         def image
-          return self.class.const_get('DOCKER_IMAGE') if self.class.const_defined?('DOCKER_IMAGE')
+          return self.class.const_get(:DOCKER_IMAGE) if self.class.const_defined?(:DOCKER_IMAGE)
 
           raise NotImplementedError, "#{self.class.name} must specify a docker image as DOCKER_IMAGE"
         end
 
         def tag
-          return self.class.const_get('DOCKER_IMAGE_TAG') if self.class.const_defined?('DOCKER_IMAGE_TAG')
+          return self.class.const_get(:DOCKER_IMAGE_TAG) if self.class.const_defined?(:DOCKER_IMAGE_TAG)
 
           raise NotImplementedError, "#{self.class.name} must specify a docker image tag as DOCKER_IMAGE_TAG"
         end

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

@@ -36,9 +36,9 @@ module Gitlab
 
         def reconfigure
           setup_omnibus
-          @docker.attach(name) do |line, wait|
+          @docker.attach(name) do |line, _wait|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -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/gitaly_cluster.rb

@@ -6,11 +6,11 @@ module Gitlab
       class GitalyCluster
         class GitalyClusterConfig
           attr_accessor :gitlab_name, :network, :airgapped_network,
-                        :praefect_node_name, :praefect_port, :praefect_ip,
-                        :primary_node_name, :primary_node_port,
-                        :secondary_node_name, :secondary_node_port,
-                        :tertiary_node_name, :tertiary_node_port,
-                        :database_node_name, :database_port
+            :praefect_node_name, :praefect_port, :praefect_ip,
+            :primary_node_name, :primary_node_port,
+            :secondary_node_name, :secondary_node_port,
+            :tertiary_node_name, :tertiary_node_port,
+            :database_node_name, :database_port
 
           attr_reader :praefect_addr, :primary_node_addr, :secondary_node_addr, :tertiary_node_addr, :database_node_addr
 
@@ -79,9 +79,15 @@ module Gitlab
 
           if parallel_gitaly
             threads = []
-            threads << Thread.new { @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release) }
-            threads << Thread.new { @gitaly_secondary_node = gitaly(config.secondary_node_name, config.secondary_node_port, release) }
-            threads << Thread.new { @gitaly_tertiary_node = gitaly(config.tertiary_node_name, config.tertiary_node_port, release) }
+            threads << Thread.new do
+              @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release)
+            end
+            threads << Thread.new do
+              @gitaly_secondary_node = gitaly(config.secondary_node_name, config.secondary_node_port, release)
+            end
+            threads << Thread.new do
+              @gitaly_tertiary_node = gitaly(config.tertiary_node_name, config.tertiary_node_port, release)
+            end
             threads.each(&:join)
           else
             @gitaly_primary_node = gitaly(config.primary_node_name, config.primary_node_port, release)
@@ -135,13 +141,13 @@ module Gitlab
             postgresql['enable'] = false;
             redis['enable'] = false;
             nginx['enable'] = false;
-            grafana['enable'] = false;
             puma['enable'] = false;
             sidekiq['enable'] = false;
             gitlab_workhorse['enable'] = false;
             gitlab_rails['rake_cache_clear'] = false;
             gitlab_rails['auto_migrate'] = false;
             gitlab_exporter['enable'] = false;
+            gitlab_kas['enable'] = false;
           OMNIBUS
         end
       end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/AbcSize
 
 require 'securerandom'
@@ -17,19 +18,19 @@ module Gitlab
         using Rainbow
 
         attr_reader :release,
-                    :omnibus_configuration,
-                    :omnibus_gitlab_rails_env,
-                    :authority_volume,
-                    :ssl_volume
+          :omnibus_configuration,
+          :omnibus_gitlab_rails_env,
+          :authority_volume,
+          :ssl_volume
 
         attr_accessor :tls,
-                      :skip_availability_check,
-                      :runner_network,
-                      :seed_admin_token,
-                      :seed_db,
-                      :skip_server_hooks,
-                      :gitaly_tls,
-                      :secrets
+          :skip_availability_check,
+          :runner_network,
+          :seed_admin_token,
+          :seed_db,
+          :skip_server_hooks,
+          :gitaly_tls,
+          :secrets
 
         attr_writer :name, :relative_path
 
@@ -182,9 +183,9 @@ module Gitlab
         def reconfigure
           setup_omnibus
 
-          @docker.attach(name) do |line, wait|
+          @docker.attach(name) do |line, _wait|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -235,17 +236,30 @@ module Gitlab
           manifest['software']['package-scripts']['locked_version']
         end
 
-        def copy_key_file(env_key)
-          key_dir = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
-          key_file = Tempfile.new(env_key.downcase, key_dir)
-          key_file.write(ENV.fetch(env_key))
-          key_file.close
+        def create_key_file(env_key)
+          directory = ENV['CI_PROJECT_DIR'] || Dir.tmpdir
+          unique_filename = "#{env_key.downcase}_#{Time.now.to_i}_#{rand(100)}"
+          key_file_path = File.join(directory, unique_filename)
+
+          File.open(key_file_path, 'w') do |file|
+            file.write(ENV.fetch(env_key))
+            file.fsync
+          end
 
-          File.chmod(0o744, key_file.path)
+          File.chmod(0o744, key_file_path)
+          @volumes[key_file_path] = key_file_path
 
-          @volumes[key_file.path] = key_file.path
+          key_file_path
+        end
 
-          key_file.path
+        def delete_key_file(path)
+          FileUtils.rm_f(path)
+        end
+
+        def teardown!
+          log_pg_stats
+
+          super
         end
 
         private
@@ -300,6 +314,19 @@ module Gitlab
           ["gitlab-rails runner #{DATA_PATH}/admin_access_token_seed.rb"]
         end
 
+        def log_pg_stats
+          Runtime::Logger.debug('Fetching pg statistics')
+          File.open("#{Runtime::Env.host_artifacts_dir}/pg_stats.log", 'a') do |file|
+            file << "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- #{name} -- Postgres statistics after test run:\n"
+            file << "Live and dead row counts:\n"
+            file << @docker.exec(name, %(gitlab-psql -c 'select n_live_tup, n_dead_tup, relname from pg_stat_all_tables order by n_live_tup DESC, n_dead_tup DESC;'))
+            file << "Cumulative user table statistics:\n"
+            file << @docker.exec(name, %(gitlab-psql -c 'select * from pg_stat_user_tables;'))
+          end
+        rescue StandardError => e
+          Runtime::Logger.error("Error getting pg statistics: #{e}")
+        end
+
         class Availability
           def initialize(name, relative_path: '', scheme: 'http', protocol_port: 80)
             @docker = Docker::Engine.new

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This component sets up the MailHog (https://github.com/mailhog/MailHog)
 # image with the proper configuration for SMTP email delivery from Gitlab
 

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

@@ -37,7 +37,7 @@ module Gitlab
           setup_omnibus
           @docker.attach(name) do |line|
             # TODO, workaround which allows to detach from the container
-            break if /gitlab Reconfigured!/.match?(line)
+            break if line.include?('gitlab Reconfigured!')
           end
         end
 
@@ -50,7 +50,7 @@ module Gitlab
         def wait_until_ready
           @docker.exec(name, 'praefect -config /var/opt/gitlab/praefect/cluster_config.toml check || true') do |resp|
             Runtime::Logger.info(resp)
-            break if /All checks passed/.match?(line)
+            break if line.include?('All checks passed')
           end
         end
 
@@ -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

@@ -27,12 +27,17 @@ module Gitlab
 
         def start
           pull_images
-          docker.run(image: image, tag: tag, args: ['-container-network', network]) do |command|
+          docker.run(image: image, tag: tag, args:
+                      ['-video-recorder-image',
+                        QA::Runtime::Env.video_recorder_image,
+                        '-container-network',
+                        network,
+                        '-timeout',
+                        '10m0s']
+          ) do |command|
             set_command_args(command)
             set_volumes(command)
           end
-
-          wait_until_ready
         end
 
         def wait_until_ready(max_attempts: 20, wait: 2)
@@ -50,14 +55,16 @@ module Gitlab
         private
 
         def grid_healthy?
-          HTTP.get('http://localhost:4444/ping').status&.success?
-        rescue HTTP::ConnectionError => _e
+          host = ENV['CI'] || ENV['CI_SERVER'] ? 'docker' : 'localhost'
+          HTTP.get("http://#{host}: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: QA::Runtime::Env.selenoid_browser_image, tag: Runtime::Env.selenoid_browser_version)
+          docker.pull(image: QA::Runtime::Env.video_recorder_image, tag: QA::Runtime::Env.video_recorder_version)
         end
 
         # Set custom run command arguments

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/AbcSize
 
@@ -20,11 +21,14 @@ module Gitlab
           @volumes = {}
           @additional_hosts = []
           @default_volumes = { '/var/run/docker.sock' => '/var/run/docker.sock' }
+
+          if Runtime::Env.qa_rspec_report_path.present? # rubocop:disable Style/IfUnlessModifier
+            @default_volumes[Runtime::Env.qa_rspec_report_path] = File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'rspec')
+          end
+
           return if Runtime::Env.qa_knapsack_report_path.blank?
 
-          @default_volumes[Runtime::Env.qa_knapsack_report_path] = File.join(
-            Docker::Volumes::QA_CONTAINER_WORKDIR, 'knapsack'
-          )
+          @default_volumes[Runtime::Env.qa_knapsack_report_path] = File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'knapsack')
         end
 
         def perform
@@ -53,8 +57,10 @@ module Gitlab
 
           feature_flag_sets = []
 
-          # When `args` includes `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
-          # `feature_flag_sets` will be set to `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
+          # When `args` includes:
+          #   `[..., "--disable-feature", "a", "--enable-feature", "b", "--set-feature-flags", "c=enable", ...]`
+          # `feature_flag_sets` will be set to:
+          #   `[["--disable-feature", "a"], ["--enable-feature", "b"], ["--set-feature-flags", "c=enable"]]`
           # This will result in tests running three times, once with each feature flag option.
           while (index = args&.index { |x| x =~ /--.*-feature/ })
             feature_flag_sets << args.slice!(index, 2)

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

@@ -13,9 +13,9 @@ module Gitlab
 
         def self.release
           QA::Release.new(image)
-        rescue Support::InvalidResponseError => ex
-          warn ex.message
-          warn "#{ex.response.code} #{ex.response.message}: #{ex.response.body}"
+        rescue Support::InvalidResponseError => e
+          warn e.message
+          warn "#{e.response.code} #{e.response.message}: #{e.response.body}"
           exit 1
         end
 
@@ -81,7 +81,7 @@ module Gitlab
           end
 
           def api_get!
-            @response_body ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+            @response_body ||=
               begin
                 response = Support::GetRequest.new(uri, Runtime::Env.qa_access_token).execute!
                 JSON.parse(response.body)

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

@@ -43,7 +43,8 @@ module Gitlab
         #
         # @return [void]
         def prepare
-          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV['CI_BUILDS_DIR'])}/telegraf.conf", 'w') do |file|
+          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV.fetch('CI_BUILDS_DIR', nil))}/telegraf.conf",
+            'w') do |file|
             file.write(config)
             file.path
           end

data/lib/gitlab/qa/docker/engine.rb

@@ -18,7 +18,8 @@ module Gitlab
         end
 
         def login(username:, password:, registry:)
-          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}), mask_secrets: password)
+          Docker::Command.execute(%(login --username "#{username}" --password "#{password}" #{registry}),
+            mask_secrets: password)
         end
 
         def pull(image:, tag: nil, quiet: true)
@@ -63,7 +64,8 @@ module Gitlab
             Class.new do
               # @param file The name of the file
               # @param contents The content of the file to write
-              # @param expand_vars Set false if you need to write an environment variable '$' to a file. The variable should be escaped \\\$
+              # @param expand_vars Set false if you need to write an environment variable '$' to a file.
+              # The variable should be escaped \\\$
               def self.write(file, contents, expand_vars = true)
                 if expand_vars
                   %(echo "#{contents}" > #{file};)
@@ -82,7 +84,8 @@ module Gitlab
         def exec(name, command, mask_secrets: nil)
           cmd = ['exec']
           cmd << '--privileged' if privileged_command?(command)
-          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"), mask_secrets: mask_secrets)
+          Docker::Command.execute(%(#{cmd.join(' ')} #{name} bash -c "#{command.gsub('"', '\\"')}"),
+            mask_secrets: mask_secrets)
         end
 
         def read_file(image, tag, path, &block)

data/lib/gitlab/qa/docker/volumes.rb

@@ -20,7 +20,7 @@ module Gitlab
           # but Docker on macOS exposes /private and disallow exposing /var/
           # so we need to get the real tmpdir path
           Dir.mktmpdir('gitlab-qa-', File.realpath(Dir.tmpdir)).tap do |dir|
-            yield Hash[@volumes.map { |k, v| ["#{dir}/#{k}", v] }]
+            yield @volumes.transform_keys { |k| "#{dir}/#{k}" }
           end
         end
       end

data/lib/gitlab/qa/release.rb

@@ -11,7 +11,7 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      /xi.freeze
+      /xi
       CUSTOM_GITLAB_IMAGE_REGEX = %r{
         \A
           (?<image_without_tag>
@@ -23,7 +23,7 @@ module Gitlab
           (-qa)?
           (:(?<tag>.+))?
         \z
-      }xi.freeze
+      }xi
 
       delegate :ci_project_path, to: Gitlab::QA::Runtime::Env
 
@@ -39,7 +39,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee|jh)
         \z
-      /xi.freeze
+      /xi
 
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
@@ -53,7 +53,7 @@ module Gitlab
         \A
           (?<version>\d+\.\d+(.\d+)?)\.(?<timestamp>\d+)-(?<gitlab_ref>[A-Za-z0-9]+)\.(?<omnibus_ref>[A-Za-z0-9]+)
         \z
-      /xi.freeze
+      /xi
 
       DEFAULT_TAG = 'latest'
       DEFAULT_CANONICAL_TAG = 'nightly'

data/lib/gitlab/qa/runner.rb

@@ -29,7 +29,8 @@ module Gitlab
             Runtime::Scenario.define(:teardown, false)
           end
 
-          opts.on('--no-tests', 'Orchestrates the docker containers but does not run the tests. Implies --no-teardown') do
+          opts.on('--no-tests',
+            'Orchestrates the docker containers but does not run the tests. Implies --no-teardown') do
             Runtime::Scenario.define(:run_tests, false)
             Runtime::Scenario.define(:teardown, false)
           end
@@ -42,7 +43,12 @@ module Gitlab
             Runtime::Scenario.define(:skip_server_hooks, true)
           end
 
-          opts.on('--qa-image QA_IMAGE', String, 'Specifies a QA image to be used instead of inferring it from the GitLab image. See Gitlab::QA::Release#qa_image') do |value|
+          opts.on(
+            '--qa-image QA_IMAGE',
+            String,
+            "Specifies a QA image to be used instead of inferring it from the GitLab image." \
+            "See Gitlab::QA::Release#qa_image"
+          ) do |value|
             Runtime::Scenario.define(:qa_image, value)
           end
 
@@ -58,7 +64,8 @@ module Gitlab
             end
           end
 
-          opts.on('--seed-db search_pattern1[,search_pattern2,...]', 'Seed application database with sample test data') do |file_pattern|
+          opts.on('--seed-db search_pattern1[,search_pattern2,...]',
+            'Seed application database with sample test data') do |file_pattern|
             file_pattern.split(',').each do |pattern|
               @seed_scripts << pattern
             end