gitlab-qa 8.15.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e196210d260a788803b5c5d8109b645d8acc3e8d1a60a5bd8ab46110dc94aa9
-  data.tar.gz: c656c359e25150a2e8fde966aee83ca704924704149e6b3413519d9753123590
+  metadata.gz: fff29a089097412047c17a713152bab09d779b6b81632e2762501c2ea37eeed0
+  data.tar.gz: 74c1d481f56ff0497e14cac6f235b282aa121031be0a77dab0a95bf0b490fdc3
 SHA512:
-  metadata.gz: 4a6a2bd9405ae3fb3a972609e94d82412f037340c15f9d55a64ff12b6e11aec7e71e730697857de43493b4fea8e022e167f23a98caba4992bf49e06339ca8caa
-  data.tar.gz: 75adc84ac465f2c1f1d2d4ebc4d2c511c929c9b4c5a04b84b7f78fef12e3de9989aca9df7a69a2b359cc66196e1849cd0d25fc8d9432cabb45cff083006e1a67
+  metadata.gz: b6d43ecfbe3359130fc691e1057113da2705f551d0149f5183192451b42c4608dd3daf6760a304c3ef710a0ed03e7a232e21ed6c93006fa873c55a37746f6d10
+  data.tar.gz: 0f4eb1b06e9bcfd11c6782cba8da19c2ac489c4adf5f14b43e6e2be823bc8f71b2be04fa7b5a6eca4c018cf805a04e1794b4a3676f081c999852cbe4ff4a2d4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-qa (8.15.2)
+    gitlab-qa (9.0.0)
       activesupport (~> 6.1)
       gitlab (~> 4.18.0)
       http (~> 5.0)

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

@@ -63,7 +63,7 @@ module Gitlab
         end
 
         def set_license_mode
-          return unless Runtime::Env.test_license_mode?
+          return unless Runtime::Env.gitlab_license_mode == 'test'
 
           @omnibus_gitlab_rails_env['GITLAB_LICENSE_MODE'] = 'test'
           @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = Runtime::Env.customer_portal_url

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

@@ -328,10 +328,6 @@ module Gitlab
           enabled?(env_var_value_if_defined('GEO_FAILOVER'), default: false)
         end
 
-        def test_license_mode?
-          enabled?(env_var_value_if_defined('TEST_LICENSE_MODE'), default: false)
-        end
-
         def qa_export_test_metrics?
           enabled?(env_var_value_if_defined('QA_EXPORT_TEST_METRICS'), default: true)
         end
@@ -369,6 +365,10 @@ module Gitlab
           env_var_value_if_defined('QA_COM_REGISTRY') || 'registry.gitlab.com'
         end
 
+        def gitlab_license_mode
+          env_var_value_if_defined('GITLAB_LICENSE_MODE')
+        end
+
         def customer_portal_url
           env_var_value_if_defined('CUSTOMER_PORTAL_URL') || 'https://customers.staging.gitlab.com'
         end
@@ -377,6 +377,10 @@ module Gitlab
           enabled?(env_var_value_if_defined('GITLAB_ALLOW_SEPARATE_CI_DATABASE'), default: false)
         end
 
+        def mock_github_enabled?
+          enabled?(env_var_value_if_defined('QA_MOCK_GITHUB'), default: false)
+        end
+
         private
 
         def enabled?(value, default: true)

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

@@ -90,7 +90,7 @@ module Gitlab
             # @return [Array]
             def mocked_hosts
               hosts = []
-              hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.enabled?(ENV["QA_MOCK_GITHUB"])
+              hosts << "api.github.com:#{mock_server.ip_address}" if Runtime::Env.mock_github_enabled?
 
               hosts
             end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '8.15.2'
+    VERSION = '9.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 8.15.2
+  version: 9.0.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -396,7 +396,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/license_mode.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_aws.rb
 - lib/gitlab/qa/runtime/omnibus_configurations/object_storage_gcs.rb

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module QA
-    module Runtime
-      module OmnibusConfigurations
-        class LicenseMode < Default
-          def configuration
-            <<~OMNIBUS
-              gitlab_rails['env'] = { 'GITLAB_LICENSE_MODE' => 'test', 'CUSTOMER_PORTAL_URL' => '#{customer_portal_url}' }
-            OMNIBUS
-          end
-
-          private
-
-          # Customer Portal URL that is targeted
-          def customer_portal_url
-            Runtime::Env.customer_portal_url
-          end
-        end
-      end
-    end
-  end
-end