diff --git a/lib/gitlab/qa/component/gitlab.rb b/lib/gitlab/qa/component/gitlab.rb index b0a5cadb83e3a71d209126f24ee905474f1b7bbf..f6901c9e83932c8155b2e7a3691507a92926708e 100644 --- a/lib/gitlab/qa/component/gitlab.rb +++ b/lib/gitlab/qa/component/gitlab.rb @@ -64,7 +64,7 @@ module Gitlab return unless Runtime::Env.test_license_mode? @omnibus_gitlab_rails_env['GITLAB_LICENSE_MODE'] = 'test' - @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = 'https://customers.staging.gitlab.com' + @omnibus_gitlab_rails_env['CUSTOMER_PORTAL_URL'] = Runtime::Env.customer_portal_url end def elastic_url=(url) diff --git a/lib/gitlab/qa/runtime/env.rb b/lib/gitlab/qa/runtime/env.rb index 1223c65b982e93bed0111616b8cfd672aa2f5eb5..fe30779c9208d3c554bd8e9ab09ba7955d9b3d7b 100644 --- a/lib/gitlab/qa/runtime/env.rb +++ b/lib/gitlab/qa/runtime/env.rb @@ -369,14 +369,18 @@ module Gitlab env_var_value_if_defined('QA_COM_REGISTRY') || 'registry.gitlab.com' end + def customer_portal_url + env_var_value_if_defined('CUSTOMER_PORTAL_URL') || 'https://customers.staging.gitlab.com' + end + + private + def enabled?(value, default: true) return default if value.nil? (value =~ /^(false|no|0)$/i) != 0 end - private - def env_var_value_valid?(variable) !ENV[variable].blank? end diff --git a/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb b/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb index 38ae01f1ac37545b07b741b4a6ed16655e6dcc66..8ab1f3b0e6e2c29795906823b0ca33cc1b45099a 100644 --- a/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb +++ b/lib/gitlab/qa/runtime/omnibus_configurations/license_mode.rb @@ -15,7 +15,7 @@ module Gitlab # Customer Portal URL that is targeted def customer_portal_url - ENV.fetch('CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com') + Runtime::Env.customer_portal_url end end end