gitlab-qa 14.19.2 → 14.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0fcc43f5168f06e595be207434f527027f248c79e9d8cf8e487145ea04a5d4d
-  data.tar.gz: da86ca5c312a88236b2caedfa415780875169b45372b4139957e0ec0319b6539
+  metadata.gz: d84483452fba7a39c684e4b5b7f772a63712c6d400027b579dca7769ce231c7e
+  data.tar.gz: 64e52ceaa976d1dc0a3f513a26e71f4e529c5a9d9eea8c39474f683da963d718
 SHA512:
-  metadata.gz: 775235af65035d6f707aeb42fb1f06d92bf93fac76f809e433cb910041209d4a887bef3202f142e172c1effa4ff4796bbae22cfb5093d508200ddb6e975aff44
-  data.tar.gz: bc3ea767044fa48b63d3c4b6fb6f340eff33d5c9e2fae9b7770be46ffe7188962cbb4b89350a15cbdca58623f87f3f019bf2db276efe151b88a0e98667bda26a
+  metadata.gz: 8633d6f704664548214395cf5e3b8560e6776f0052d5dcf1da91d3239e5489236877495b9bc077043f4efeb588e15272c595dfda0dc147386818d2a3c505d476
+  data.tar.gz: ca524f4c69c44fab4241cfd836bf2ed0f10047a3b030f942474ed360c8f7356a3ee678aa56dbb59a38697add270dcc8a881789a84fc3c675eb5b65f6395d0425

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
 ## Developer Certificate of Origin + License
 
-By contributing to GitLab B.V., You accept and agree to the following terms and
-conditions for Your present and future Contributions submitted to GitLab B.V.
-Except for the license granted herein to GitLab B.V. and recipients of software
-distributed by GitLab B.V., You reserve all right, title, and interest in and to
+By contributing to GitLab Inc., You accept and agree to the following terms and
+conditions for Your present and future Contributions submitted to GitLab Inc.
+Except for the license granted herein to GitLab Inc. and recipients of software
+distributed by GitLab Inc., You reserve all right, title, and interest in and to
 Your Contributions. All Contributions are subject to the following DCO + License
 terms.
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (14.19.2)
+    gitlab-qa (14.21.0)
       activesupport (>= 6.1, < 7.2)
+      ffi (~> 1.17)
       gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)
@@ -94,7 +95,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.15.5)
+    ffi (1.17.0)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 GitLab B.V.
+Copyright (c) 2011-2017 GitLab Inc.
 
 With regard to the GitLab Software:
 

data/gitlab-qa.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '3.7.0'
 
   spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.2'
+  spec.add_runtime_dependency 'ffi', '~> 1.17'
   spec.add_runtime_dependency 'gitlab', '~> 4.19'
   spec.add_runtime_dependency 'http', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'

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

@@ -7,6 +7,8 @@ module Gitlab
         DOCKER_IMAGE = 'registry.gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/model-gateway'
         DOCKER_IMAGE_TAG = 'latest'
 
+        LOG_FILE_NAME = 'modelgateway_debug.log'
+
         # Test signing key to enable direct connection code completions
         # https://gitlab.com/gitlab-org/modelops/applied-ml/code-suggestions/ai-assist/-/blob/97f54f4b7e43258a39bba7f29f38fe44bd316ce5/example.env#L79
         TEST_SIGNING_KEY =
@@ -87,17 +89,42 @@ module Gitlab
           @name ||= 'ai-gateway'
         end
 
+        def host_log_path
+          File.join(Runtime::Env.host_artifacts_dir, name, 'logs', LOG_FILE_NAME)
+        end
+
+        def container_log_path
+          File.join('home', 'aigateway', 'app', LOG_FILE_NAME)
+        end
+
         def configure_environment(gitlab_hostname:)
           @environment = {
             'AIGW_GITLAB_URL' => "http://#{gitlab_hostname}",
             'AIGW_GITLAB_API_URL' => "http://#{gitlab_hostname}/api/v4",
             'AIGW_CUSTOMER_PORTAL_URL' => Runtime::Env.customer_portal_url,
             'AIGW_MOCK_MODEL_RESPONSES' => true,
+            'AIGW_LOGGING__LEVEL' => 'debug',
+            'AIGW_LOGGING__TO_FILE' => LOG_FILE_NAME,
             'AIGW_SELF_SIGNED_JWT__SIGNING_KEY' => TEST_SIGNING_KEY,
             'AIGW_SELF_SIGNED_JWT__VALIDATION_KEY' => TEST_VALIDATION_KEY,
             'CLOUD_CONNECTOR_SERVICE_NAME' => 'gitlab-ai-gateway'
           }
         end
+
+        def teardown
+          # Copy debug log file to host artifacts directory
+          begin
+            Docker::Command.execute(
+              "cp #{name}:#{container_log_path} #{host_log_path}"
+            )
+          rescue Support::ShellCommand::StatusError => e
+            Runtime::Logger.warn(
+              "Unable to copy log file from #{name}: #{e.message}"
+            )
+          end
+
+          super
+        end
       end
     end
   end

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

@@ -68,6 +68,12 @@ module Gitlab
           @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = Runtime::Env.customer_portal_url
         end
 
+        def set_cloud_connector_base_url
+          return if Runtime::Env.cloud_connector_base_url.blank?
+
+          @omnibus_gitlab_rails_env['CLOUD_CONNECTOR_BASE_URL'] = Runtime::Env.cloud_connector_base_url
+        end
+
         # Sets GITLAB_QA_USER_AGENT as a Rail environment variable so that it can be used by GitLab to bypass features
         # that can't be automated.
         def set_qa_user_agent
@@ -138,6 +144,7 @@ module Gitlab
           set_formless_login_token
           set_license_mode
           set_qa_user_agent
+          set_cloud_connector_base_url
           env = @omnibus_gitlab_rails_env.merge(
             {
               'GITLAB_ALLOW_SEPARATE_CI_DATABASE' => Runtime::Env.allow_separate_ci_database.to_s,

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

@@ -327,6 +327,12 @@ module Gitlab
           end
         end
 
+        def require_cloud_connector_base_url!
+          return unless cloud_connector_base_url.blank?
+
+          raise ArgumentError, "Please provide CLOUD_CONNECTOR_BASE_URL"
+        end
+
         def require_initial_password!
           return unless env_var_value_if_defined('GITLAB_INITIAL_ROOT_PASSWORD').to_s.strip.empty?
 
@@ -434,6 +440,10 @@ module Gitlab
           env_var_value_if_defined('CUSTOMER_PORTAL_URL') || 'https://customers.staging.gitlab.com'
         end
 
+        def cloud_connector_base_url
+          env_var_value_if_defined('CLOUD_CONNECTOR_BASE_URL')
+        end
+
         def ee_activation_code
           env_var_value_if_defined('QA_EE_ACTIVATION_CODE')
         end

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

@@ -15,19 +15,41 @@ module Gitlab
           class Import < Scenario::Template
             def initialize
               @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|
-                server.network = @network
-                server.tls = true
-              end
+
+              @source_gitlab = new_gitlab_instance
+              @target_gitlab = new_gitlab_instance
+              @mock_server = new_mock_server
+              @mail_hog_server = new_mail_hog_server
+              @spec_suite = 'Test::Integration::Import'
+            end
+
+            attr_reader :source_gitlab, :target_gitlab, :mock_server, :network, :spec_suite, :mail_hog_server
+
+            def configure_omnibus(gitlab, mail_hog)
+              raise NotImplementedError
             end
 
-            attr_reader :source_gitlab, :target_gitlab, :mock_server, :network
+            # Import tests that spins up two gitlab instances
+            #
+            # @example
+            # perform(gitlab-ee, gitlab-ee:17.4.0-ee.0)
+            # => will perform import from gitlab-ee:17.4.0-ee.0 to gitlab-ee
+            #
+            # @param [String] target_release target gitlab instance version release docker image(default)
+            # @param [String] source_release source gitlab instance version, if its not passed takes the target release as default
+            # @param [Array] *rspec_args rspec arguments
+            # @return [void]
+            def perform(target_release, source_release = nil, *rspec_args)
+              # When source_release isn't actually passed but RSpec args arg passed with `-- rspec_args...`,
+              # source_release is wrongly set to `--`, so we fix that here.
+              if source_release == "--"
+                rspec_args.prepend('--')
+                source_release = nil
+              end
 
-            def perform(release, *rspec_args)
+              source_release = target_release if source_release.nil?
               start_mock_server
-              start_gitlab_instances(release)
+              start_gitlab_instances(source_release, target_release)
 
               run_specs(rspec_args)
             ensure
@@ -38,6 +60,45 @@ module Gitlab
 
             private
 
+            # Initialize a mailhog instance
+            #
+            # @note this does not start the instance
+            # @return [Gitlab::QA::Component::MailHog] Mailhog instance
+            def new_mail_hog_server
+              Component::MailHog.new.tap do |mail_hog|
+                mail_hog.network = @network
+                mail_hog.set_mailhog_hostname
+              end
+            end
+
+            # Check if MailHog server is needed
+            #
+            # @param [Hash] gitlab_instance
+            # @return [Boolean]
+            def mail_hog_server_needed?(gitlab_instance)
+              respond_to?(:orchestrate_mail_hog_server) && gitlab_instance[:name] == "import-target"
+            end
+
+            # Start MailHog server
+            #
+            # @param [Hash] gitlab_instance
+            # @return [void]
+            def start_mail_hog_server(gitlab_instance)
+              configure_omnibus(gitlab_instance[:instance], mail_hog_server)
+              mail_hog_server.start_instance
+            end
+
+            # Initialize a mock server instance
+            #
+            # @note this does not start the instance
+            # @return [Gitlab::QA::Component::MockServer] mock server instance
+            def new_mock_server
+              Component::MockServer.new.tap do |server|
+                server.network = @network
+                server.tls = true
+              end
+            end
+
             # Start mock server instance
             #
             # @return [void]
@@ -45,25 +106,60 @@ module Gitlab
               mock_server.start_instance
             end
 
-            # Start gitlab instance
+            # Initialize a gitlab instance
             #
-            # @param [Gitlab::QA::Release] release
+            # @note this does not start the instance
+            # @return [Gitlab::QA::Component::Gitlab] gitlab instance
+            def new_gitlab_instance
+              Component::Gitlab.new.tap { |gitlab| gitlab.network = @network }
+            end
+
+            # Setup GitLab instance
+            #
+            # @param [Hash] gitlab_instance
             # @return [void]
-            def start_gitlab_instances(release)
-              instances = [
-                { instance: source_gitlab, name: "import-source", additional_hosts: [] },
-                { instance: target_gitlab, name: "import-target", additional_hosts: mocked_hosts }
+            def setup_gitlab_instance(gitlab_instance)
+              gitlab_instance[:instance].tap do |gitlab|
+                configure_gitlab_instance(gitlab, gitlab_instance)
+                start_mail_hog_server(gitlab_instance) if mail_hog_server_needed?(gitlab_instance)
+                gitlab.start_instance
+              end
+            end
+
+            # Configure GitLab instance
+            #
+            # @param [Gitlab::QA::Component::Gitlab] gitlab
+            # @param [Hash] gitlab_instance
+            # @return [void]
+            def configure_gitlab_instance(gitlab, gitlab_instance)
+              gitlab.name = gitlab_instance[:name]
+              gitlab.release = gitlab_instance[:release]
+              gitlab.additional_hosts = gitlab_instance[:additional_hosts]
+              gitlab.seed_admin_token = true
+            end
+
+            # Build GitLab instances
+            #
+            # @param [Gitlab::QA::Release] source_release
+            # @param [Gitlab::QA::Release] target_release
+            # @return [Array<Hash>]
+            def build_gitlab_instances(source_release, target_release)
+              [
+                { instance: source_gitlab, name: "import-source", additional_hosts: [], release: source_release },
+                { instance: target_gitlab, name: "import-target", additional_hosts: mocked_hosts, release: target_release }
               ]
+            end
+
+            # Start gitlab instance
+            #
+            # @param [Gitlab::QA::Release] source_release
+            # @param [Gitlab::QA::Release] target_release
+            # @return [void]
+            def start_gitlab_instances(source_release, target_release)
+              instances = build_gitlab_instances(source_release, target_release)
 
               ::Parallel.each(instances, in_threads: 2) do |gitlab_instance|
-                gitlab_instance[:instance].tap do |gitlab|
-                  gitlab.name = gitlab_instance[:name]
-                  gitlab.release = release
-                  gitlab.additional_hosts = gitlab_instance[:additional_hosts]
-                  gitlab.seed_admin_token = true
-
-                  gitlab.start_instance
-                end
+                setup_gitlab_instance(gitlab_instance)
               end
             end
 
@@ -71,9 +167,11 @@ module Gitlab
             #
             # @param [Array] rspec_args
             # @return [void]
-            def run_specs(rspec_args)
+            def run_specs(rspec_args) # rubocop:disable Metrics/AbcSize
+              Runtime::Logger.info("Running #{spec_suite} specs!")
+
               Component::Specs.perform do |specs|
-                specs.suite = "Test::Integration::Import"
+                specs.suite = spec_suite
                 specs.release = target_gitlab.release
                 specs.network = network
                 specs.args = [target_gitlab.address, *rspec_args]

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          # Scenario type for testing importers with smtp enabled in target gitlab instance
+          class ImportWithSMTP < Import
+            attr_reader :orchestrate_mail_hog_server
+
+            def initialize
+              @spec_suite = 'Test::Integration::ImportWithSMTP'
+              @orchestrate_mail_hog_server = true
+              super
+            end
+
+            def configure_omnibus(gitlab, mail_hog)
+              gitlab.omnibus_configuration << <<~OMNIBUS
+                gitlab_rails['smtp_enable'] = true;
+                gitlab_rails['smtp_address'] = '#{mail_hog.hostname}';
+                gitlab_rails['smtp_port'] = 1025;
+              OMNIBUS
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Gitlab
           class UpdateFromPrevious < Scenario::Template
             using Rainbow
 
+            attr_reader :rspec_args
+
             # Test update from N - 1 (major|minor|patch) version to current release
             # Run health check (or smoke if below 17.1.0) test suite on previous release to populate some data in database before update
             #
@@ -36,6 +38,7 @@ module Gitlab
                 semver_component,
                 from_edition || @current_release.edition
               ).fetch
+              @rspec_args = rspec_args
 
               upgrade_info = "#{[*upgrade_path, current_release].join(' => ')} (#{current_version})".bright
               Runtime::Logger.info("Performing gitlab update: #{upgrade_info}")
@@ -43,6 +46,18 @@ module Gitlab
               update(rspec_args)
             end
 
+            def seeding_suite_args
+              first_release_version = extract_version(upgrade_path.first.release)
+              if Gem::Version.new(first_release_version) < Gem::Version.new("17.1.0")
+                ["--", "--tag", "smoke"]
+              else
+                ["--", "--tag", "health_check"]
+              end
+            end
+
+            # this is any action or event that may happen before the seeding suite is run
+            def pre_seeding_environment_actions(gitlab); end
+
             private
 
             attr_reader :current_release, :upgrade_path
@@ -62,16 +77,9 @@ module Gitlab
             # 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, seeding_suite_args)
+                run_gitlab(upgrade_path.first, volumes, seeding_suite_args, seeding_run: true)
 
                 # deploy releases in upgrade path
                 upgrade_path[1..].each do |release|
@@ -91,7 +99,7 @@ module Gitlab
             # @param [Gitlab::QA::Release] release
             # @param [Hash] volumes
             # @return [void]
-            def run_gitlab(release, volumes, rspec_args = [], skip_setup: false) # rubocop:disable Metrics/AbcSize
+            def run_gitlab(release, volumes, rspec_args = [], skip_setup: false, seeding_run: false) # rubocop:disable Metrics/AbcSize
               Runtime::Logger.info("Deploying release: #{release.to_s.bright}")
 
               Component::Gitlab.perform do |gitlab|
@@ -99,6 +107,7 @@ module Gitlab
                 gitlab.release = release
                 gitlab.volumes = volumes
                 gitlab.network = Runtime::Env.docker_network
+                gitlab.set_ee_activation_code if @use_cloud_license
 
                 if skip_setup
                   gitlab.skip_server_hooks = true
@@ -108,7 +117,10 @@ module Gitlab
 
                 next gitlab.launch_and_teardown_instance unless run_specs?(release)
 
-                gitlab.instance { run_specs(gitlab, release, rspec_args) }
+                gitlab.instance do
+                  pre_seeding_environment_actions(gitlab) if seeding_run
+                  run_specs(gitlab, release, rspec_args)
+                end
               end
             end
 

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Omnibus
+          class UpdateFromPreviousAi < UpdateFromPrevious
+            def initialize
+              Runtime::Env.require_cloud_connector_base_url!
+              @use_cloud_license = true
+              @perform_license_sync_event = false
+              super
+            end
+
+            def seeding_suite_args
+              super + (rspec_args[1..] || [])
+            end
+
+            def pre_seeding_environment_actions(gitlab)
+              super
+              set_up_gitlab_duo(gitlab)
+            end
+
+            private
+
+            def set_up_gitlab_duo(gitlab)
+              setup_src_path = File.expand_path('../../../../../../support/setup', __dir__)
+              setup_dest_path = '/tmp/setup-scripts'
+
+              Runtime::Logger.info('Setting up Gitlab Duo on GitLab instance')
+
+              gitlab.docker.copy(gitlab.name, setup_src_path, setup_dest_path)
+
+              gitlab.docker.exec(
+                gitlab.name,
+                "ASSIGN_SEATS=true HAS_ADD_ON=true gitlab-rails runner #{setup_dest_path}/gitlab_duo_setup.rb",
+                mask_secrets: gitlab.secrets
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '14.19.2'
+    VERSION = '14.21.0'
   end
 end

data/lib/gitlab/qa.rb

@@ -48,7 +48,8 @@ module Gitlab
       'registry_tls' => 'RegistryTLS',
       'jetbrains' => 'JetBrains',
       'vscode' => 'VSCode',
-      'cli_commands' => 'CLICommands'
+      'cli_commands' => 'CLICommands',
+      'import_with_smtp' => 'ImportWithSMTP'
     )
 
     loader.setup

data/support/setup/gitlab_duo_setup.rb

@@ -88,10 +88,14 @@ class GitlabDuoSetup
     end
 
     def duo_pro_add_on
+      return nil unless GitlabSubscriptions::AddOn.respond_to?(:code_suggestions)
+
       find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.code_suggestions.last)
     end
 
     def duo_enterprise_add_on
+      return nil unless GitlabSubscriptions::AddOn.respond_to?(:duo_enterprise)
+
       find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.duo_enterprise.last)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 14.19.2
+  version: 14.21.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -212,6 +212,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +470,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/gitlab_pages.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/import.rb
+- lib/gitlab/qa/scenario/test/integration/import_with_smtp.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
 - lib/gitlab/qa/scenario/test/integration/integrations.rb
 - lib/gitlab/qa/scenario/test/integration/jira.rb
@@ -477,6 +492,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/suggested_reviewer.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/update_from_previous.rb
+- lib/gitlab/qa/scenario/test/omnibus/update_from_previous_ai.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb
 - lib/gitlab/qa/service/cluster_provider/base.rb
 - lib/gitlab/qa/service/cluster_provider/k3d.rb