From bf2690663ceae33084832e33c5c9cce9509c40c2 Mon Sep 17 00:00:00 2001 From: Tom Heng Date: Mon, 9 Jan 2023 14:11:52 +0800 Subject: [PATCH] Change customer_portal_url to env variable --- lib/gitlab/qa/component/gitlab.rb | 2 +- lib/gitlab/qa/runtime/env.rb | 8 ++++++-- .../qa/runtime/omnibus_configurations/license_mode.rb | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/qa/component/gitlab.rb b/lib/gitlab/qa/component/gitlab.rb index b0a5cadb..f6901c9e 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 1223c65b..fe30779c 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 38ae01f1..8ab1f3b0 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 -- GitLab