summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Panchenko <apanchenko@mirantis.com>2016-12-02 11:56:54 +0200
committerArtem Panchenko <apanchenko@mirantis.com>2016-12-02 12:49:50 +0200
commitb54dbdc3aa10ceaafdeff6027cacd80536fa6b49 (patch)
treef6555fe05d548af755308667fdd364cc7f72f84b
parentde7c9a4fd7803c009ce0d0f9914c1522a987b27c (diff)
Disable netchecker deployment in Calico tests
Since we deploy and run netchecker applications by tests for Calico, disable its deployment in kargo. Change-Id: I2946e8db3aa63c49ddd8ed03287a16b9619c3141
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Andrey Sledzinskiy <asledzinskiy@mirantis.com> Workflow+1: Dmitry Tyzhnenko <dtyzhnenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 02 Dec 2016 16:11:28 +0000 Reviewed-on: https://review.openstack.org/406026 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/settings.py2
-rw-r--r--fuel_ccp_tests/tests/system/test_calico.py4
-rw-r--r--fuel_ccp_tests/tests/system/test_netchecker.py4
3 files changed, 10 insertions, 0 deletions
diff --git a/fuel_ccp_tests/settings.py b/fuel_ccp_tests/settings.py
index 9f54204..c3f7d3f 100644
--- a/fuel_ccp_tests/settings.py
+++ b/fuel_ccp_tests/settings.py
@@ -110,6 +110,8 @@ CALICO = {
110 None), 110 None),
111 "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY', 111 "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY',
112 None), 112 None),
113 "deploy_netchecker": get_var_as_bool('DEPLOY_NETCHECKER',
114 None),
113} 115}
114 116
115for key, val in CALICO.items(): 117for key, val in CALICO.items():
diff --git a/fuel_ccp_tests/tests/system/test_calico.py b/fuel_ccp_tests/tests/system/test_calico.py
index e76f3b4..03c19bf 100644
--- a/fuel_ccp_tests/tests/system/test_calico.py
+++ b/fuel_ccp_tests/tests/system/test_calico.py
@@ -16,6 +16,7 @@ import pytest
16 16
17import base_test 17import base_test
18from fuel_ccp_tests import logger 18from fuel_ccp_tests import logger
19from fuel_ccp_tests import settings
19from fuel_ccp_tests.helpers import netchecker 20from fuel_ccp_tests.helpers import netchecker
20 21
21LOG = logger.logger 22LOG = logger.logger
@@ -25,6 +26,9 @@ LOG = logger.logger
25class TestFuelCCPCalico(base_test.SystemBaseTest): 26class TestFuelCCPCalico(base_test.SystemBaseTest):
26 """Test class for Calico network plugin in k8s""" 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 @pytest.mark.fail_snapshot 32 @pytest.mark.fail_snapshot
29 @pytest.mark.snapshot_needed 33 @pytest.mark.snapshot_needed
30 def test_k8s_netchecker_calico(self, underlay, k8scluster, config, 34 def test_k8s_netchecker_calico(self, underlay, k8scluster, config,
diff --git a/fuel_ccp_tests/tests/system/test_netchecker.py b/fuel_ccp_tests/tests/system/test_netchecker.py
index b302ba2..28a947a 100644
--- a/fuel_ccp_tests/tests/system/test_netchecker.py
+++ b/fuel_ccp_tests/tests/system/test_netchecker.py
@@ -26,6 +26,10 @@ LOG = logger.logger
26 26
27 27
28class TestFuelCCPNetCheckerMixin: 28class TestFuelCCPNetCheckerMixin:
29
30 kube_settings = settings.DEFAULT_CUSTOM_YAML
31 kube_settings['deploy_netchecker'] = False
32
29 pod_yaml_file = os.path.join( 33 pod_yaml_file = os.path.join(
30 settings.NETCHECKER_SERVER_DIR, 34 settings.NETCHECKER_SERVER_DIR,
31 'k8s_resources/netchecker-server_pod.yaml') 35 'k8s_resources/netchecker-server_pod.yaml')