Merge "Disable netchecker deployment in Calico tests"
This commit is contained in:
commit
cab3213efe
|
@ -111,6 +111,8 @@ CALICO = {
|
||||||
None),
|
None),
|
||||||
"enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY',
|
"enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY',
|
||||||
None),
|
None),
|
||||||
|
"deploy_netchecker": get_var_as_bool('DEPLOY_NETCHECKER',
|
||||||
|
None),
|
||||||
}
|
}
|
||||||
|
|
||||||
for key, val in CALICO.items():
|
for key, val in CALICO.items():
|
||||||
|
|
|
@ -16,6 +16,7 @@ import pytest
|
||||||
|
|
||||||
import base_test
|
import base_test
|
||||||
from fuel_ccp_tests import logger
|
from fuel_ccp_tests import logger
|
||||||
|
from fuel_ccp_tests import settings
|
||||||
from fuel_ccp_tests.helpers import netchecker
|
from fuel_ccp_tests.helpers import netchecker
|
||||||
|
|
||||||
LOG = logger.logger
|
LOG = logger.logger
|
||||||
|
@ -25,6 +26,9 @@ LOG = logger.logger
|
||||||
class TestFuelCCPCalico(base_test.SystemBaseTest):
|
class TestFuelCCPCalico(base_test.SystemBaseTest):
|
||||||
"""Test class for Calico network plugin in k8s"""
|
"""Test class for Calico network plugin in k8s"""
|
||||||
|
|
||||||
|
kube_settings = settings.DEFAULT_CUSTOM_YAML
|
||||||
|
kube_settings['deploy_netchecker'] = False
|
||||||
|
|
||||||
@pytest.mark.fail_snapshot
|
@pytest.mark.fail_snapshot
|
||||||
@pytest.mark.snapshot_needed
|
@pytest.mark.snapshot_needed
|
||||||
def test_k8s_netchecker_calico(self, underlay, k8scluster, config,
|
def test_k8s_netchecker_calico(self, underlay, k8scluster, config,
|
||||||
|
|
|
@ -26,6 +26,10 @@ LOG = logger.logger
|
||||||
|
|
||||||
|
|
||||||
class TestFuelCCPNetCheckerMixin:
|
class TestFuelCCPNetCheckerMixin:
|
||||||
|
|
||||||
|
kube_settings = settings.DEFAULT_CUSTOM_YAML
|
||||||
|
kube_settings['deploy_netchecker'] = False
|
||||||
|
|
||||||
pod_yaml_file = os.path.join(
|
pod_yaml_file = os.path.join(
|
||||||
settings.NETCHECKER_SERVER_DIR,
|
settings.NETCHECKER_SERVER_DIR,
|
||||||
'k8s_resources/netchecker-server_pod.yaml')
|
'k8s_resources/netchecker-server_pod.yaml')
|
||||||
|
|
Loading…
Reference in New Issue