x
/
fuel-ccp-tests
Code Issues Proposed changes

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
2b6866484e

Change-Id: I8d817d6be852e85cbe857d3963bef1ad00a24469
This commit is contained in:
Artem Panchenko 2016-09-30 17:52:50 +03:00
parent c1192b207f
commit 61c3ad0227
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_ccp_tests/settings.py
View File

@ -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():

1
fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
View File

@ -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

1
fuel_ccp_tests/tests/component/k8s/test_dashboard.py
View File

@ -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)

1
fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py
View File

@ -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