gitlab-qa 14.10.0 → 14.12.0

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

@@ -10,7 +10,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
                 gitlab.name = 'gitlab'
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.omnibus_configuration << gitlab_omnibus_configuration
                 cluster = Component::GitalyCluster.perform do |c|
                   c.config = Component::GitalyCluster::GitalyClusterConfig.new(gitlab_name: 'gitlab')

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

@@ -10,7 +10,7 @@ module Gitlab
             SETUP_DEST_PATH = '/tmp/setup-scripts'
 
             def initialize
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @ai_gateway_name = 'ai-gateway'
               @ai_gateway_hostname = "#{@ai_gateway_name}.#{@network}"
               @ai_gateway_port = 5000
@@ -42,6 +42,7 @@ module Gitlab
               gitlab.network = @network
 
               gitlab.omnibus_gitlab_rails_env['AI_GATEWAY_URL'] = "http://#{@ai_gateway_hostname}:#{@ai_gateway_port}"
+              gitlab.omnibus_gitlab_rails_env['LLM_DEBUG'] = 'true'
 
               gitlab.set_ee_activation_code if @use_cloud_license
             end

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

@@ -9,7 +9,7 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab'
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'client_ssl'
             end

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

@@ -26,7 +26,7 @@ module Gitlab
                 setup_elasticsearch_on gitlab
 
                 Component::Elasticsearch.perform do |elastic|
-                  elastic.network = 'test'
+                  elastic.network = Runtime::Env.docker_network
                   elastic.instance do
                     gitlab.instance do
                       Runtime::Logger.info("Running #{spec_suite} specs!")
@@ -49,7 +49,7 @@ module Gitlab
 
             def setup_elasticsearch_on(instance)
               instance.name = gitlab_name
-              instance.network = 'test'
+              instance.network = Runtime::Env.docker_network
               instance.elastic_url = 'http://elastic68:9200'
               instance.exec_commands = empty_index
             end

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

@@ -8,7 +8,7 @@ module Gitlab
           class GitlabPages < Scenario::Template
             def initialize
               @gitlab_name = 'gitlab-pages'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @pages_host = 'gitlab-pages.test'
               @pages_sandbox_name = 'gitlab-qa-sandbox-group-pages'
               @tag = 'gitlab_pages'

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

@@ -14,7 +14,7 @@ module Gitlab
           #
           class Import < Scenario::Template
             def initialize
-              @network = "test"
+              @network = Runtime::Env.docker_network
               @source_gitlab = Component::Gitlab.new.tap { |gitlab| gitlab.network = @network }
               @target_gitlab = Component::Gitlab.new.tap { |gitlab| gitlab.network = @network }
               @mock_server = Component::MockServer.new.tap do |server|

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab-integrations'
                 gitlab.instance do
                   Component::Specs.perform do |specs|

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = QA::Release.new(release)
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab-jira'
 
                 Component::Jira.perform do |jira|

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

@@ -21,7 +21,7 @@ module Gitlab
 
             def initialize
               @ldap_name = 'ldap-server'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
             end
 
             def configure_omnibus(gitlab)
@@ -69,7 +69,7 @@ module Gitlab
             def orchestrate_ldap(&block)
               Component::LDAP.perform do |ldap|
                 ldap.name = 'ldap-server'
-                ldap.network = 'test'
+                ldap.network = Runtime::Env.docker_network
                 ldap.set_gitlab_credentials
                 ldap.tls = tls
 
@@ -81,7 +81,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.name = gitlab_name
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.tls = tls
                 configure_omnibus(gitlab)
 

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
 
                 mattermost_hostname = "mattermost.#{gitlab.network}"
                 mattermost_external_url = "http://#{mattermost_hostname}"

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

@@ -12,7 +12,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
                 gitlab.ports = [PUMA_METRICS_SERVER_PORT, SIDEKIQ_METRICS_SERVER_PORT]
 

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

@@ -10,7 +10,7 @@ module Gitlab
               @gitlab_name = 'gitlab'
               @gitaly_name = 'gitaly'
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'mtls'
             end

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

@@ -27,7 +27,7 @@ module Gitlab
                 setup_opensearch_on gitlab
 
                 Component::Opensearch.perform do |opensearch|
-                  opensearch.network = 'test'
+                  opensearch.network = Runtime::Env.docker_network
                   opensearch.instance do
                     gitlab.instance do
                       Runtime::Logger.info("Running #{spec_suite} specs!")
@@ -50,7 +50,7 @@ module Gitlab
 
             def setup_opensearch_on(instance)
               instance.name = gitlab_name
-              instance.network = 'test'
+              instance.network = Runtime::Env.docker_network
               instance.elastic_url = "http://elastic68:9200"
               instance.exec_commands = empty_index
             end

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
 
                 gitlab.omnibus_configuration << <<~OMNIBUS

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
                 gitlab.tls = true
 

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

@@ -11,9 +11,9 @@ module Gitlab
 
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = 'gitlab'
-                gitlab.seed_admin_token = false
+                gitlab.seed_admin_token = true
                 sign_url_key_path = gitlab.create_key_file('GOOGLE_CDN_SIGNURL_KEY')
                 cdn_gcloud_path = gitlab.create_key_file('GOOGLE_CDN_JSON_KEY')
 

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

@@ -18,19 +18,19 @@ module Gitlab
               # no-op
             end
 
-            def perform(release, *rspec_args)
+            def perform(release, *rspec_args) # rubocop:disable Metrics/AbcSize
               release = QA::Release.new(release)
               before_perform(release)
 
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = gitlab_name
                 gitlab.set_accept_insecure_certs
 
                 if saml_component
                   Component::SAML.perform do |saml|
-                    saml.network = 'test'
+                    saml.network = Runtime::Env.docker_network
                     configure(gitlab, saml)
 
                     saml.instance do

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

@@ -9,7 +9,7 @@ module Gitlab
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
 
                 gitlab.omnibus_configuration << <<~OMNIBUS
                   gitlab_rails['usage_ping_enabled'] = false;

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

@@ -28,7 +28,7 @@ module Gitlab
 
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
                 gitlab.name = gitlab_name
 
                 Component::MailHog.perform do |mail_hog|

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

@@ -10,7 +10,7 @@ module Gitlab
 
             def initialize
               @spec_suite = 'Test::Instance::All'
-              @network = 'test'
+              @network = Runtime::Env.docker_network
               @env = {}
               @tag = 'suggested_reviewer'
               @gitlab_name = 'gitlab-suggested-reviewer'

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

@@ -9,7 +9,7 @@ module Gitlab
             using Rainbow
 
             # Test update from N - 1 (major|minor|patch) version to current release
-            # Run smoke test suite on previous release to populate some data in database before update
+            # Run health check (or smoke if below 17.1.0) test suite on previous release to populate some data in database before update
             #
             # @example
             # perform(gitlab-ee:dev-tag, 15.3.0-pre, major)
@@ -24,6 +24,7 @@ module Gitlab
             def perform(release, current_version, semver_component, from_edition = nil, *rspec_args)
               # When from_edition isn't actually passed but RSpec args arg passed with `-- rspec_args...`,
               # from_edition is wrongly set to `--`, so we fix that here.
+
               if from_edition == "--"
                 rspec_args.prepend('--')
                 from_edition = nil
@@ -46,15 +47,31 @@ module Gitlab
 
             attr_reader :current_release, :upgrade_path
 
+            # Extract version number from a string, for example: "gitlab/gitlab-ee:15.11.13-ee.0"
+            #
+            # @param [String] version_string version string to extract from
+            # @return [String] extracted version number
+            def extract_version(version_string)
+              QA::Release.new(version_string).tag.split('-').first
+            end
+
             # Perform update
             #
             # @param [Array] rspec_args
             # @return [void]
+            # rubocop:disable Metrics/AbcSize
             def update(rspec_args)
               Docker::Volumes.new.with_temporary_volumes do |volumes|
+                first_release_version = extract_version(upgrade_path.first.release)
+                seeding_suite_args = if Gem::Version.new(first_release_version) < Gem::Version.new("17.1.0")
+                                       ["--", "--tag", "smoke"]
+                                     else
+                                       ["--", "--tag", "health_check"]
+                                     end
+
                 # deploy first release in upgrade path and run specs to populate db
                 Runtime::Logger.info("Running the first release in upgrade path: #{upgrade_path.first}")
-                run_gitlab(upgrade_path.first, volumes, ["--", "--tag", "smoke"])
+                run_gitlab(upgrade_path.first, volumes, seeding_suite_args)
 
                 # deploy releases in upgrade path
                 upgrade_path[1..].each do |release|
@@ -67,6 +84,7 @@ module Gitlab
                 run_gitlab(current_release, volumes, rspec_args, skip_setup: true)
               end
             end
+            # rubocop:enable Metrics/AbcSize
 
             # Deploy gitlab instance and optionally run specs
             #
@@ -79,7 +97,7 @@ module Gitlab
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.volumes = volumes
-                gitlab.network = 'test'
+                gitlab.network = Runtime::Env.docker_network
 
                 if skip_setup
                   gitlab.skip_server_hooks = true
@@ -100,8 +118,8 @@ module Gitlab
             # @param [Array] rspec_args
             # @return [void]
             def run_specs(gitlab, release, rspec_args) # rubocop:disable Metrics/AbcSize
-              Runtime::Logger.info("Running smoke test to verify update and seed data in environment") unless upgrade_path.first != release
-              Runtime::Logger.info("Running smoke test to verify update") unless current_release != release
+              Runtime::Logger.info("Running test suite to verify update and seed data in environment") unless upgrade_path.first != release
+              Runtime::Logger.info("Running test suite to verify update") unless current_release != release
 
               Component::Specs.perform do |specs|
                 specs.release = release
@@ -119,11 +137,11 @@ module Gitlab
               end
             rescue Support::ShellCommand::StatusError => e
               if release == current_release # only fail on current release
-                Runtime::Logger.error("Failed to run test suite after final upgrade to release '#{release}'")
+                Runtime::Logger.error("Failed to run health check after final upgrade to release '#{release}'")
                 raise e
               end
 
-              Runtime::Logger.warn("Test run for release '#{gitlab.release}' finished with errors!")
+              Runtime::Logger.warn("Health check verification for release '#{gitlab.release}' finished with errors!")
             end
 
             # Run specs on first release to populate database and release being tested

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

@@ -82,9 +82,9 @@ module Gitlab
         # @return [String]
         def upgrade_path_yml
           @upgrade_path_yml ||= begin
-            logger.info("Fetching gitlab upgrade path from 'gitlab-com/support/toolbox/upgrade-path' project")
+            logger.info("Fetching gitlab upgrade path from 'gitlab.com/gitlab-org/gitlab' project")
             HttpRequest.make_http_request(
-              url: "https://gitlab.com/gitlab-com/support/toolbox/upgrade-path/-/raw/main/upgrade-path.yml"
+              url: "https://gitlab.com/gitlab-org/gitlab/-/raw/master/config/upgrade_path.yml"
             ).body
           end
         end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.10.0'
+    VERSION = '14.12.0'
   end
 end

data/rubocop/cop/gitlab/dangerous_interpolation.rb

@@ -119,7 +119,6 @@ module RuboCop
           'GCS_CDN_BUCKET_NAME' => :gcs_cdn_bucket_name,
           'GCS_BUCKET_NAME' => :gcs_bucket_name,
           'SMOKE_ONLY' => :smoke_only,
-          'NO_ADMIN' => :no_admin,
           'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm,
           'COLORIZED_LOGS' => :colorized_logs,
           'FIPS' => :fips,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.10.0
+  version: 14.12.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -409,7 +409,6 @@ files:
 - lib/gitlab/qa/component/staging.rb
 - lib/gitlab/qa/component/staging_ref.rb
 - lib/gitlab/qa/component/suggested_reviewer.rb
-- lib/gitlab/qa/component/telegraf.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
 - lib/gitlab/qa/docker/volumes.rb
@@ -442,7 +441,6 @@ files:
 - lib/gitlab/qa/scenario/test/instance/repository_storage.rb
 - lib/gitlab/qa/scenario/test/instance/smoke.rb
 - lib/gitlab/qa/scenario/test/instance/staging.rb
-- lib/gitlab/qa/scenario/test/instance/staging_geo.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref.rb
 - lib/gitlab/qa/scenario/test/instance/staging_ref_geo.rb
 - lib/gitlab/qa/scenario/test/integration/ai_gateway.rb
@@ -480,7 +478,6 @@ files:
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb
-- lib/gitlab/qa/scenario/test/sanity/version.rb
 - lib/gitlab/qa/service/cluster_provider/base.rb
 - lib/gitlab/qa/service/cluster_provider/k3d.rb
 - lib/gitlab/qa/service/kubernetes_cluster.rb

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

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-require 'tempfile'
-
-module Gitlab
-  module QA
-    module Component
-      # Component to collect docker metrics
-      #
-      class Telegraf < Base
-        DOCKER_IMAGE = 'telegraf'
-        DOCKER_IMAGE_TAG = '1.21-alpine'
-        LOG_DIR = '/etc/telegraf/log'
-
-        def initialize
-          super
-
-          @name = DOCKER_IMAGE
-          @host_log_dir = "#{Runtime::Env.host_artifacts_dir}/#{@name}"
-          @environment = Runtime::Env.variables.slice(
-            'QA_INFLUXDB_TOKEN',
-            'QA_INFLUXDB_URL',
-            'QA_RUN_TYPE',
-            'CI_JOB_NAME',
-            'CI_PIPELINE_ID'
-          )
-        end
-
-        attr_reader :name, :host_log_dir, :telegraf_config
-
-        # Start container
-        #
-        # @return [void]
-        def start
-          docker.run(image: image, tag: tag) do |command|
-            set_command_args(command)
-            set_volumes(command)
-            set_environment(command)
-          end
-        end
-
-        # Run prepare commands
-        #
-        # @return [void]
-        def prepare
-          @telegraf_config = File.open("#{Dir.mktmpdir(nil, ENV.fetch('CI_BUILDS_DIR', nil))}/telegraf.conf",
-            'w') do |file|
-            file.write(config)
-            file.path
-          end
-          FileUtils.mkdir_p(host_log_dir)
-
-          prepare_docker_image
-          prepare_docker_container
-        end
-
-        # Run teardown
-        #
-        # @return [void]
-        def teardown
-          return unless run_telegraf?
-
-          super
-        end
-
-        private
-
-        # Set custom run command arguments
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_command_args(command)
-          command << '-d'
-          command << "--name #{name}"
-          command << "--user root"
-          command << "--entrypoint telegraf"
-        end
-
-        # Set volumes
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_volumes(command)
-          command.volume(host_log_dir, LOG_DIR)
-          command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-          command.volume(telegraf_config, '/etc/telegraf/telegraf.conf', :ro)
-        end
-
-        # Set environment variables
-        #
-        # @param [Docker::Command] command
-        # @return [void]
-        def set_environment(command)
-          environment.each { |k, v| command.env(k, v) }
-        end
-
-        # Run main entrypoint
-        #
-        # @return [void]
-        def instance_no_teardown
-          if run_telegraf?
-            super
-          else
-            Runtime::Logger.debug("Skipping starting telegraf container!")
-            yield self if block_given?
-          end
-        end
-
-        # Should telegraf be started
-        #
-        # Run only on CI and skip if metrics explicitly disabled, run_type not set or influx params missing
-        #
-        # @return [Boolean]
-        def run_telegraf?
-          Runtime::Env.ci && Runtime::Env.qa_export_test_metrics? && Runtime::Env.qa_run_type && !missing_influx_config?
-        end
-
-        # Influxdb config params missing
-        #
-        # @return [Boolean]
-        def missing_influx_config?
-          environment.slice('QA_INFLUXDB_TOKEN', 'QA_INFLUXDB_URL').any? { |_k, v| v.blank? }
-        end
-
-        # Telegraf configuration
-        #
-        # @return [String]
-        def config
-          <<~CONFIG
-            [global_tags]
-              run_type = "${QA_RUN_TYPE}"
-              pipeline_id = "${CI_PIPELINE_ID}"
-              job_name = "${CI_JOB_NAME}"
-
-            [agent]
-              interval = "1s"
-              round_interval = true
-              metric_batch_size = 1000
-              metric_buffer_limit = 10000
-              collection_jitter = "0s"
-              flush_interval = "10s"
-              flush_jitter = "0s"
-              precision = ""
-              debug = true
-              logtarget = "file"
-              logfile = "#{LOG_DIR}/telegraf.log"
-              hostname = ""
-              omit_hostname = false
-
-            [[outputs.influxdb_v2]]
-              urls = ["${QA_INFLUXDB_URL}"]
-              token = "${QA_INFLUXDB_TOKEN}"
-              organization = "gitlab-qa"
-              bucket = "test-env-stats"
-
-            [[inputs.docker]]
-              endpoint = "unix:///var/run/docker.sock"
-              gather_services = false
-              container_names = []
-              source_tag = false
-              container_name_include = []
-              container_name_exclude = ["#{name}"]
-              timeout = "5s"
-              perdevice = false
-              perdevice_include = []
-              total = true
-              total_include = ["cpu", "blkio", "network"]
-              docker_label_include = []
-              docker_label_exclude = []
-          CONFIG
-        end
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Scenario
-      module Test
-        module Instance
-          ##
-          # Run test suite against staging.gitlab.com
-          #
-          class StagingGeo < DeploymentBase
-            def initialize
-              @suite = 'QA::EE::Scenario::Test::Geo'
-            end
-
-            def deployment_component
-              Component::Staging
-            end
-
-            def non_rspec_args
-              [
-                '--primary-address', deployment_component::ADDRESS,
-                '--secondary-address', deployment_component::GEO_SECONDARY_ADDRESS,
-                '--without-setup'
-              ]
-            end
-          end
-        end
-      end
-    end
-  end
-end