From b54dbdc3aa10ceaafdeff6027cacd80536fa6b49 Mon Sep 17 00:00:00 2001 From: Artem Panchenko Date: Fri, 2 Dec 2016 11:56:54 +0200 Subject: [PATCH] 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 --- fuel_ccp_tests/settings.py | 2 ++ fuel_ccp_tests/tests/system/test_calico.py | 4 ++++ fuel_ccp_tests/tests/system/test_netchecker.py | 4 ++++ 3 files changed, 10 insertions(+) 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 = { None), "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY', None), + "deploy_netchecker": get_var_as_bool('DEPLOY_NETCHECKER', + None), } for 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 import base_test from fuel_ccp_tests import logger +from fuel_ccp_tests import settings from fuel_ccp_tests.helpers import netchecker LOG = logger.logger @@ -25,6 +26,9 @@ LOG = logger.logger class TestFuelCCPCalico(base_test.SystemBaseTest): """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.snapshot_needed 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 class TestFuelCCPNetCheckerMixin: + + kube_settings = settings.DEFAULT_CUSTOM_YAML + kube_settings['deploy_netchecker'] = False + pod_yaml_file = os.path.join( settings.NETCHECKER_SERVER_DIR, 'k8s_resources/netchecker-server_pod.yaml')