Browse Source

Merge "Disable netchecker deployment in Calico tests"

Jenkins 2 years ago
parent
commit
cab3213efe

+ 2
- 0
fuel_ccp_tests/settings.py View File

@@ -111,6 +111,8 @@ CALICO = {
111 111
                                                None),
112 112
     "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY',
113 113
                                              None),
114
+    "deploy_netchecker": get_var_as_bool('DEPLOY_NETCHECKER',
115
+                                         None),
114 116
 }
115 117
 
116 118
 for key, val in CALICO.items():

+ 4
- 0
fuel_ccp_tests/tests/system/test_calico.py View File

@@ -16,6 +16,7 @@ import pytest
16 16
 
17 17
 import base_test
18 18
 from fuel_ccp_tests import logger
19
+from fuel_ccp_tests import settings
19 20
 from fuel_ccp_tests.helpers import netchecker
20 21
 
21 22
 LOG = logger.logger
@@ -25,6 +26,9 @@ LOG = logger.logger
25 26
 class TestFuelCCPCalico(base_test.SystemBaseTest):
26 27
     """Test class for Calico network plugin in k8s"""
27 28
 
29
+    kube_settings = settings.DEFAULT_CUSTOM_YAML
30
+    kube_settings['deploy_netchecker'] = False
31
+
28 32
     @pytest.mark.fail_snapshot
29 33
     @pytest.mark.snapshot_needed
30 34
     def test_k8s_netchecker_calico(self, underlay, k8scluster, config,

+ 4
- 0
fuel_ccp_tests/tests/system/test_netchecker.py View File

@@ -26,6 +26,10 @@ LOG = logger.logger
26 26
 
27 27
 
28 28
 class TestFuelCCPNetCheckerMixin:
29
+
30
+    kube_settings = settings.DEFAULT_CUSTOM_YAML
31
+    kube_settings['deploy_netchecker'] = False
32
+
29 33
     pod_yaml_file = os.path.join(
30 34
         settings.NETCHECKER_SERVER_DIR,
31 35
         'k8s_resources/netchecker-server_pod.yaml')

Loading…
Cancel
Save