gitlab-qa 13.1.0 → 14.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16a2d1d19d2421861d4698ef692926f2fa15cc9f4081e39d1ca7e4da46a8ba7c
-  data.tar.gz: 0c65e2931b680e7737df751f702943e40851ac207afcb3be7a01765ec2b47291
+  metadata.gz: 4e82e5e8777aac74ac46ccdc60d9fdc8df5c4136523c92d8f5fd88ab21f25c86
+  data.tar.gz: 5c6e6cff8abd9abe2b8442e9d41718a6f5af17ce01b70770e075490d8d0d8ca9
 SHA512:
-  metadata.gz: 81c553e7373d1fc790429dd8e4e9c1538e7c2a6afc382b7b79170c0edb6b8b83c4f533a60746defc313c846ab92fb4505f84899f3eede1f21bcdcdc586e7b90c
-  data.tar.gz: 492ad5e00e24b345ab1ac724dcf059c9520d992df141a03b413b674262720138a724ed44d633b9d9a926f40471aa44744994b8dcf38eee8753d03728ad3c715e
+  metadata.gz: f89a050668380aea6fe6032eedd280f4a51b6163c920f31d4fecd4596b3a7a077f037ef6196d7a8e86f77c1df56c80f4e80ea9857b81c74573bdad79c05a9d1e
+  data.tar.gz: b2ec3b5c597de4d3fcdb320e4351c3df2d6f4fb62916479f03005a9680d79250defaa331dd14deea03d657384cf05a1a16909463493fe3600d7e3df87690c0a3

data/.gitlab-ci.yml

@@ -8,10 +8,10 @@
     - vendor/ruby
 
 include:
-  - project: 'gitlab-org/quality/pipeline-common'
-    file:
-      - '/ci/gem-release.yml'
-      - '/ci/danger-review.yml'
+  - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
+    inputs:
+      job_image: "${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.4"
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
 
 stages:
   - check
@@ -97,7 +97,6 @@ cache-gems:
         - Gemfile.lock
 
 danger-review:
-  image: ${CI_REGISTRY}/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.4
   stage: check
   needs:
     - job: cache-gems

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (13.1.0)
-      activesupport (>= 6.1, < 7.1)
+    gitlab-qa (14.0.1)
+      activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)
@@ -14,16 +14,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5.1)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark (0.2.0)
+    bigdecimal (3.1.5)
     byebug (11.1.3)
     claide (1.1.0)
     claide-plugins (0.9.2)
@@ -33,7 +40,8 @@ GEM
     climate_control (1.0.1)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.5)
@@ -58,6 +66,8 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    drb (2.2.0)
+      ruby2_keywords
     e2mmap (0.1.0)
     faraday (1.10.2)
       faraday-em_http (~> 1.0)
@@ -115,7 +125,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.6.3)
@@ -132,9 +142,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    minitest (5.21.1)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
+    mutex_m (0.2.0)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
     nokogiri (1.13.9)
@@ -242,7 +253,7 @@ GEM
     thor (1.2.1)
     tilt (2.0.11)
     timecop (0.9.6)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext

data/docs/environment_setup/users.md

@@ -0,0 +1,9 @@
+# Environment Setup | Users
+
+Most tests ([orchestrated and instance-level](../docs/what_tests_can_be_run.md#the-two-types-of-qa-tests)) [run as the default `root` user](https://gitlab.com/gitlab-org/gitlab/-/blob/3f247bf0d6d24b479b7f169f9c14068968d9672a/qa/qa/runtime/user.rb#L16). However, some require additional users. If the test framework has administrator access to the test environment it can create users itself. If administrator access is not available you will need to create users before being able to run certain tests.
+
+## Disable email verification
+
+If [email verification](https://docs.gitlab.com/ee/security/email_verification.html) is enabled on the test environment (via the `require_email_verification` feature flag), a user cannot log in under certain conditions (e.g., logging in the first time from a new location) unless they enter a verification code that is sent to their email address.
+
+To disable email verification you can disable the `require_email_verification` feature flag, which will disable email verification for all users on the instance. Alternatively, you can skip verification for individual users by enabling the `skip_require_email_verification` feature flag for that user.

data/docs/what_tests_can_be_run.md

@@ -108,7 +108,7 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
 | `QA_1P_EMAIL` | - | Email address for authenticating into 1Password. | No |
 | `QA_1P_PASSWORD` | - | Password for authenticating into 1Password. | No |
 | `QA_1P_SECRET` | - | Secret for authenticating into 1Password. | No |
-| `QA_1P_GITHUB_UUID` | - | UUID for GitHub item in GitLab-QA 1Password vault. | No |
+| `QA_1P_GITHUB_UUID` | - | UUID for gitlab-qa-github item in gitlab-qa-totp 1Password vault. | No |
 | `RELEASE` | - | The release image to use for an orchestrated GitLab instance. | No |
 | `RELEASE_REGISTRY_URL` | - | The registry url to fetch the release image for an orchestrated GitLab. | No |
 | `RELEASE_REGISTRY_USERNAME` | - | The username to log in to the registry for pulling the release image for orchestrated GitLab. | No |
@@ -574,7 +574,7 @@ $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
 $ gitlab-qa Test::Integration::InstanceSAML EE
 ```
 
-### `Test::Instance::Image CE|EE|<full image address> --omnibus-config oauth`
+### `Test::Instance::Image CE|EE|<full image address> --omnibus-config github_oauth`
 
 This tests that users can sign in to a GitLab instance using external OAuth services.
 
@@ -591,10 +591,10 @@ container is spun up and tests are run from it by running the `Test::Instance::A
 - `QA_GITHUB_OAUTH_APP_SECRET`: Client Secret for GitHub OAuth app. This can be found in the shared 1Password vault.
 - `QA_GITHUB_USERNAME`: Username for authenticating with GitHub. This can be found in the shared 1Password vault.
 - `QA_GITHUB_PASSWORD`: Password for authenticating with GitHub. This can be found in the shared 1Password vault.
-- `QA_1P_EMAIL`: Email address for authenticating into 1Password for GitLab-QA vault. This can be found in the shared 1Password vault.
-- `QA_1P_PASSWORD`: Password for authenticating into 1Password for GitLab-QA vault. This can be found in the shared 1Password vault.
-- `QA_1P_SECRET`: Secret for authenticating into 1Password. This can be found in the GitLab-QA 1Password vault.
-- `QA_1P_GITHUB_UUID`: UUID for GitHub item in GitLab-QA 1Password vault. This can be found in the GitLab-QA 1Password vault.
+- `QA_1P_EMAIL`: Email address for authenticating into gitlab-qa-totp 1Password vault. This can be found in the Gitlab-QA 1Password vault.
+- `QA_1P_PASSWORD`: Password for authenticating into gitlab-qa-totp 1Password vault. This can be found in the Gitlab-QA 1Password vault.
+- `QA_1P_SECRET`: Secret for authenticating into gitlab-qa-totp 1Password vault. This can be found in the Gitlab-QA 1Password vault.
+- `QA_1P_GITHUB_UUID`: UUID for gitlab-qa-github item in gitlab-qa-totp 1Password vault. This can be found in the Gitlab-QA 1Password vault. The gitlab-qa-totp vault can be accessed with the the creds provided in 1P under "GitLab-QA 1Password user with access to gitlab-qa-totp vault"
 - `QA_GITLAB_HOSTNAME`: Hostname set for GitLab instance. This must be set to `gitlab` as the external OAuth applications have been setup to use this.
 - `QA_GITLAB_USE_TLS`: Use TLS for setting up GitLab instance. This must be set to `true` as since some external OAuth applications require the client to use TLS.
 
@@ -608,7 +608,7 @@ $ export QA_GITHUB_PASSWORD=your_github_password
 $ export QA_1P_EMAIL=1password_email
 $ export QA_1P_PASSWORD=1password_password
 $ export QA_1P_SECRET=1password_secret
-$ export QA_1P_GITHUB_UUID=1password_github_uuid
+$ export QA_1P_GITHUB_UUID=1password_gitlab-qa-github_item_uuid
 
 $ gitlab-qa Test::Integration::OAuth CE
 
@@ -1183,10 +1183,6 @@ This scenario spins up a GitLab Omnibus instance integrated with a test AI Gatew
 - `QA_EE_ACTIVATION_CODE`: An activation code for a Staging-generated Premium or Ultimate cloud license with a purchased AI add-on. This can be found in the GitLab QA 1Password vault.
 - `GITLAB_LICENSE_MODE`: Set to `test` in order to configure GitLab Omnibus with the correct license mode and `CUSTOMER_PORTAL_URL`.
 
-**Optional environment variables:**
-
-- `QA_USE_SYNC_SERVICE_TOKEN_WORKER`: When true, will enable the `use_sync_service_token_worker` feature flag during code suggestions setup to use the `SyncServiceTokenWorker` to fetch a code suggestions JWT during activation instead of the `SyncSeatLinkWorker`. See rollout issue https://gitlab.com/gitlab-org/gitlab/-/issues/431608 for details.
-
 Example:
 
 ```shell

data/gitlab-qa.gemspec

@@ -36,7 +36,7 @@ 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', '< 7.1'
+  spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.2'
   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

@@ -13,11 +13,10 @@ module Gitlab
 
         def configure_environment(gitlab_hostname:)
           @environment = {
-            'GITLAB_URL' => "http://#{gitlab_hostname}",
-            'GITLAB_API_URL' => "http://#{gitlab_hostname}/api/v4",
-            'CUSTOMER_PORTAL_BASE_URL' => Runtime::Env.customer_portal_url,
-            'USE_FAKE_MODELS' => true,
-            'USE_LOCAL_CACHE' => true
+            '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_USE_FAKE_MODELS' => true
           }
         end
       end

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

@@ -79,8 +79,6 @@ module Gitlab
           'GITLAB_QA_PASSWORD_2' => :gitlab_qa_password_2,
           'QA_GITHUB_USERNAME' => :qa_github_username,
           'QA_GITHUB_PASSWORD' => :qa_github_password,
-          'QA_FACEBOOK_USERNAME' => :qa_facebook_username,
-          'QA_FACEBOOK_PASSWORD' => :qa_facebook_password,
           'QA_GITLAB_HOSTNAME' => :qa_gitlab_hostname,
           'QA_GITLAB_USE_TLS' => :qa_gitlab_use_tls,
           'KNAPSACK_GENERATE_REPORT' => :knapsack_generate_report,
@@ -146,8 +144,6 @@ module Gitlab
           'JH_ENV' => :jh_env,
           'QA_GITHUB_OAUTH_APP_ID' => :github_oauth_app_id,
           'QA_GITHUB_OAUTH_APP_SECRET' => :github_oauth_app_secret,
-          'QA_FACEBOOK_OAUTH_APP_ID' => :facebook_oauth_app_id,
-          'QA_FACEBOOK_OAUTH_APP_SECRET' => :facebook_oauth_app_secret,
           'QA_1P_EMAIL' => :qa_1p_email,
           'QA_1P_PASSWORD' => :qa_1p_password,
           'QA_1P_SECRET' => :qa_1p_secret,
@@ -298,18 +294,7 @@ module Gitlab
 
         def require_oauth_environment!
           %w[QA_GITHUB_OAUTH_APP_ID QA_GITHUB_OAUTH_APP_SECRET QA_GITHUB_USERNAME
-            QA_GITHUB_PASSWORD QA_1P_EMAIL QA_1P_PASSWORD QA_1P_SECRET QA_1P_GITHUB_UUID QA_FACEBOOK_USERNAME
-            QA_FACEBOOK_PASSWORD QA_FACEBOOK_OAUTH_APP_SECRET QA_FACEBOOK_OAUTH_APP_ID].each do |env_key|
-            unless ENV.key?(env_key)
-              raise ArgumentError,
-                "Environment variable #{env_key} must be set to run OAuth specs"
-            end
-          end
-        end
-
-        def require_facebook_environment!
-          %w[QA_FACEBOOK_USERNAME QA_FACEBOOK_PASSWORD QA_FACEBOOK_OAUTH_APP_SECRET
-            QA_FACEBOOK_OAUTH_APP_ID].each do |env_key|
+            QA_GITHUB_PASSWORD QA_1P_EMAIL QA_1P_PASSWORD QA_1P_SECRET QA_1P_GITHUB_UUID].each do |env_key|
             unless ENV.key?(env_key)
               raise ArgumentError,
                 "Environment variable #{env_key} must be set to run OAuth specs"
@@ -432,10 +417,6 @@ module Gitlab
           env_var_value_if_defined('QA_EE_ACTIVATION_CODE')
         end
 
-        def use_sync_service_token_worker?
-          enabled?(env_var_value_if_defined('QA_USE_SYNC_SERVICE_TOKEN_WORKER'), default: false)
-        end
-
         def geo_staging_url
           env_var_value_if_defined('GEO_STAGING_URL') || 'https://geo.staging.gitlab.com'
         end

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

@@ -42,10 +42,6 @@ module Gitlab
 
               gitlab.omnibus_gitlab_rails_env['CODE_SUGGESTIONS_BASE_URL'] = "http://#{@ai_gateway_hostname}:#{@ai_gateway_port}"
 
-              # Determines whether to use the SyncServiceTokenWorker or SyncSeatLinkWorker
-              # for generating a code suggestions access token during license activation
-              gitlab.omnibus_gitlab_rails_env['QA_USE_SYNC_SERVICE_TOKEN_WORKER'] = Runtime::Env.use_sync_service_token_worker?
-
               gitlab.set_ee_activation_code
             end
 

data/lib/gitlab/qa/test_logger.rb

@@ -24,12 +24,18 @@ module Gitlab
         #
         # @param [<Symbol, String>] level
         # @param [String] source
-        # @return [ActiveSupport::Logger]
+        # @return [ActiveSupport::Logger, ActiveSupport::BroadcastLogger]
         def logger(level: :info, source: 'Gitlab QA', path: 'tmp')
           console_log = console_logger(level: level, source: source)
           file_log = file_logger(source: source, path: path)
 
-          console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+          if ActiveSupport.const_defined?(:BroadcastLogger)
+            ActiveSupport::BroadcastLogger.new(console_log, file_log)
+          elsif ActiveSupport::Logger.respond_to?(:broadcast)
+            console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+          else
+            raise 'Could not configure logger broadcasting'
+          end
         end
 
         private

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '13.1.0'
+    VERSION = '14.0.1'
   end
 end

data/support/setup/code_suggestions_setup.rb

@@ -3,11 +3,6 @@
 class CodeSuggestionsSetup
   class << self
     def configure!
-      if ENV.fetch('QA_USE_SYNC_SERVICE_TOKEN_WORKER', false)
-        puts 'Enabling use_sync_service_token_worker feature flag...'
-        Feature.enable(:use_sync_service_token_worker)
-      end
-
       puts 'Enabling code_suggestions_tokens_api feature flag...'
       Feature.enable(:code_suggestions_tokens_api)
 
@@ -42,7 +37,7 @@ class CodeSuggestionsSetup
       max_attempts = 3
       attempts = 0
 
-      until (tokens = ::Ai::ServiceAccessToken.active.count)&.positive? || attempts == max_attempts
+      until (tokens = ::CloudConnector::ServiceAccessToken.active.count)&.positive? || attempts == max_attempts
         puts 'Attempting to verify access token exists...'
         attempts += 1
         sleep 30

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 14.0.1
 platform: ruby
 authors:
 - GitLab Quality
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -201,7 +201,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -328,7 +328,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+description:
 email:
 - gitlab-qa@gmail.com
 executables:
@@ -365,6 +365,7 @@ files:
 - docs/developer/http_mocking.md
 - docs/developer/ssl.md
 - docs/developer/style_guide.md
+- docs/environment_setup/users.md
 - docs/how_it_works.md
 - docs/omnibus_configurations/license_mode.md
 - docs/release_process.md
@@ -420,7 +421,6 @@ files:
 - lib/gitlab/qa/runtime/omnibus_configurations/decomposition_multiple_db.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/decomposition_single_db.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/default.rb
-- lib/gitlab/qa/runtime/omnibus_configurations/facebook_oauth.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/github_oauth.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
@@ -516,7 +516,7 @@ homepage: http://about.gitlab.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -531,8 +531,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Integration tests for GitLab
 test_files: []

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Runtime
-      module OmnibusConfigurations
-        class FacebookOauth < Default
-          def configuration
-            Runtime::Env.require_facebook_environment!
-
-            <<~OMNIBUS
-              gitlab_rails['omniauth_enabled'] = true
-              gitlab_rails['omniauth_allow_single_sign_on'] = ['facebook']
-              gitlab_rails['omniauth_block_auto_created_users'] = false
-              gitlab_rails['omniauth_providers'] = [
-                {
-                  name: 'facebook',
-                  app_id: '$QA_FACEBOOK_OAUTH_APP_ID',
-                  app_secret: '$QA_FACEBOOK_OAUTH_APP_SECRET',
-                  verify_ssl: false
-                }
-              ];
-              letsencrypt['enable'] = false
-              external_url '<%= gitlab.address %>'
-            OMNIBUS
-          end
-        end
-      end
-    end
-  end
-end