gitlab-qa 13.2.1 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c623075f415ee608143ece59eaf3427ade2a7a0da0fd6c265c7429c841d8cad
-  data.tar.gz: d8a0a4923e127e1b289780a318a2a3f9479f4fa9b96c3651bb9fd54a095b06e6
+  metadata.gz: 296696cc4a2e892c0c0eafc9c9d232cc799dd3534cd23fe34beae8f969d0b227
+  data.tar.gz: ea82d82c938d228313bb5700fb16a951bc33608c4f1dcd45954eceaf7a5d23ce
 SHA512:
-  metadata.gz: 69d9bd5a8d29af6d7d9d4dd0be074da1052b518211a95f248abe9ad45f78bd2485ec6fb7a94ad659479ad705f6b7053ac896ee4c68c709dea8df9e2e45436bdb
-  data.tar.gz: e350f3fe1df2ad7dbb76c0beddfc021f7071e003fffdfe468f46d79a7ed0045b6b1e373da7f24f22af45b8c4c1c4b572f356b9bd08c3a608fa8ce33e8ab384ac
+  metadata.gz: 97f8137c03e3221e68fc65e2191ab8c381be781af2f6a1410c6eaa8a87ef1f2107ca1151d2ec35c14efc1b772f10d0c7109877086c3c12d6005b5226990728ed
+  data.tar.gz: 9706b1eecc0324864aa40e0a64ea6ea8c07fdbc65fca77562131e65607244d8151438817db90490ed9730913ee03555ffb16648e81d5530d208db321c2647e1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (13.2.1)
+    gitlab-qa (14.0.0)
       activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)

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
 

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"

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)
 
-          ActiveSupport::BroadcastLogger.new(console_log, 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.2.1'
+    VERSION = '14.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 13.2.1
+  version: 14.0.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -421,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

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