From 61c3ad022727fc6cddb92e37ef99b5c487b587a0 Mon Sep 17 00:00:00 2001 From: Artem Panchenko Date: Fri, 30 Sep 2016 17:52:50 +0300 Subject: [PATCH] Add an ability to turn on/off custom Calico CNI The option 'use_hyperkube_cni' for kargo can't be changed via CUSTOM_YAML: the fact is always overridden by ansible and the value depends on k8s version. Added an ability to set another kargo variable from tests - 'overwrite_hyperkube_cni', see https://github.com/kubespray/kargo/commit/2b6866484e857f9fb28e060ae9ebfaa8ffb789c4 Change-Id: I8d817d6be852e85cbe857d3963bef1ad00a24469 --- fuel_ccp_tests/settings.py | 3 ++- fuel_ccp_tests/tests/component/k8s/test_appcontroller.py | 1 - fuel_ccp_tests/tests/component/k8s/test_dashboard.py | 1 - fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fuel_ccp_tests/settings.py b/fuel_ccp_tests/settings.py index e466be6..53a8631 100644 --- a/fuel_ccp_tests/settings.py +++ b/fuel_ccp_tests/settings.py @@ -91,7 +91,6 @@ DEFAULT_CUSTOM_YAML = { "hyperkube_image_tag": HYPERKUBE_IMAGE_TAG, "hyperkube_image_repo": HYPERKUBE_IMAGE_REPO, "kube_version": KUBE_VERSION, - "use_hyperkube_cni": str("true"), "searchdomains": SEARCH_DOMAINS, } @@ -105,6 +104,8 @@ CALICO = { 'CALICO_CNI_IPAM_DOWNLOAD_URL'), "calico_cni_ipam_checksum": os.environ.get('CALICO_CNI_IPAM_CHECKSUM'), "ipip": get_var_as_bool('IPIP_USAGE', None), + "overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI', + None), } for key, val in CALICO.items(): diff --git a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py index 14004fe..b685b5a 100644 --- a/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py +++ b/fuel_ccp_tests/tests/component/k8s/test_appcontroller.py @@ -138,7 +138,6 @@ class TestAppController(object): "hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO, "hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG, "searchdomains": settings.SEARCH_DOMAINS, - "use_hyperkube_cni": "true", } @pytest.mark.ac_linear_test diff --git a/fuel_ccp_tests/tests/component/k8s/test_dashboard.py b/fuel_ccp_tests/tests/component/k8s/test_dashboard.py index 261eaa3..cd28bb0 100644 --- a/fuel_ccp_tests/tests/component/k8s/test_dashboard.py +++ b/fuel_ccp_tests/tests/component/k8s/test_dashboard.py @@ -28,7 +28,6 @@ class TestK8sDashboard(object): "hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO, "hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG, "searchdomains": settings.SEARCH_DOMAINS, - "use_hyperkube_cni": "true", } @pytest.mark.revert_snapshot(ext.SNAPSHOT.k8s_deployed) diff --git a/fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py b/fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py index 2e09e84..641df4a 100644 --- a/fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py +++ b/fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py @@ -38,7 +38,6 @@ class TestPreStackLight(object): "hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO, "hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG, "searchdomains": settings.SEARCH_DOMAINS, - "use_hyperkube_cni": str("true"), } @pytest.mark.test_stacklight_on_commit