From ba74e2f1f5d15dab6d407bd29cd953158283e9fc Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Mon, 23 Oct 2023 09:20:18 +0200 Subject: Move msb k8s override values configuration on the top settings level With the current override implementation on gating there is no way to modfy that value there Issue-ID: TEST-404 Signed-off-by: Michal Jagiello Change-Id: I0ca8654c5320d7eb32318d7cb0b1cce44387e2ef --- src/onaptests/configuration/cds_resource_resolution_settings.py | 1 - src/onaptests/configuration/pnf_macro_settings.py | 1 - src/onaptests/configuration/settings.py | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py index b972d0c..0ab6ebc 100644 --- a/src/onaptests/configuration/cds_resource_resolution_settings.py +++ b/src/onaptests/configuration/cds_resource_resolution_settings.py @@ -21,7 +21,6 @@ MSB_K8S_RB_VERSION = "v1" MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location( "templates/artifacts/profile.tar.gz")) MSB_K8S_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}" -MSB_K8S_OVERRIDE_VALUES = None K8S_VERSION = "1.0" K8S_CONFIG = get_resource_location("templates/artifacts/config") K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py index 379eaf7..d332763 100644 --- a/src/onaptests/configuration/pnf_macro_settings.py +++ b/src/onaptests/configuration/pnf_macro_settings.py @@ -38,7 +38,6 @@ MSB_K8S_RB_VERSION = "v1" MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location( "templates/artifacts/profile.tar.gz")) MSB_K8S_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}" -MSB_K8S_OVERRIDE_VALUES = None K8S_VERSION = "1.0" K8S_CONFIG = get_resource_location("templates/artifacts/config") K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py index 24b37ff..e43a15e 100644 --- a/src/onaptests/configuration/settings.py +++ b/src/onaptests/configuration/settings.py @@ -49,6 +49,7 @@ TILLER_HOST = "localhost" K8S_CONFIG = None # None means it will use default config (~/.kube/config) K8S_ONAP_NAMESPACE = "onap" # ONAP Kubernetes namespace K8S_ADDITIONAL_RESOURCES_NAMESPACE = K8S_ONAP_NAMESPACE # Resources created on tests namespace +MSB_K8S_OVERRIDE_VALUES = None # SOCK_HTTP = "socks5h://127.0.0.1:8091" ORCHESTRATION_REQUEST_TIMEOUT = 60.0 * 15 # 15 minutes in seconds -- cgit 1.2.3-korg