summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Panchenko <apanchenko@mirantis.com>2016-11-15 18:39:50 +0200
committerArtem Panchenko <apanchenko@mirantis.com>2016-11-15 19:24:46 +0200
commit0f25a78987084f0388038c286414f2657a5a3d59 (patch)
tree3aa64033df2895b57a161b9390397024b3086063
parent28b1e600c00512ae313f339c5542d372c5498e2d (diff)
Use 'calico/cni' image to get CNI binaries (kargo)
Align system tests with recent change to kargo: https://github.com/kubernetes-incubator/kargo/pull/600 Currently, custom Calico CNI binaries can be taken from Docker image only, direct download links aren't used anymore. Change-Id: Ifafda828a6307d9a81c667c0f830bc65624580af
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Volodymyr Shypyguzov <vshypyguzov@mirantis.com> Code-Review+1: Artem Grechanichenko <agrechanichenko@mirantis.com> Workflow+1: Artem Panchenko <apanchenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 16 Nov 2016 13:02:57 +0000 Reviewed-on: https://review.openstack.org/397826 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/settings.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/fuel_ccp_tests/settings.py b/fuel_ccp_tests/settings.py
index 9da886c..10deb24 100644
--- a/fuel_ccp_tests/settings.py
+++ b/fuel_ccp_tests/settings.py
@@ -103,11 +103,8 @@ CALICO = {
103 "calicoctl_image_repo": os.environ.get('CALICOCTL_IMAGE_REPO'), 103 "calicoctl_image_repo": os.environ.get('CALICOCTL_IMAGE_REPO'),
104 "calicoctl_image_tag": os.environ.get('CALICOCTL_IMAGE_TAG'), 104 "calicoctl_image_tag": os.environ.get('CALICOCTL_IMAGE_TAG'),
105 "calico_version": os.environ.get('CALICO_VERSION'), 105 "calico_version": os.environ.get('CALICO_VERSION'),
106 "calico_cni_download_url": os.environ.get('CALICO_CNI_DOWNLOAD_URL'), 106 "calico_cni_image_repo": os.environ.get('CALICO_CNI_IMAGE_REPO'),
107 "calico_cni_checksum": os.environ.get('CALICO_CNI_CHECKSUM'), 107 "calico_cni_image_tag": os.environ.get('CALICO_CNI_IMAGE_TAG'),
108 "calico_cni_ipam_download_url": os.environ.get(
109 'CALICO_CNI_IPAM_DOWNLOAD_URL'),
110 "calico_cni_ipam_checksum": os.environ.get('CALICO_CNI_IPAM_CHECKSUM'),
111 "ipip": get_var_as_bool('IPIP_USAGE', None), 108 "ipip": get_var_as_bool('IPIP_USAGE', None),
112 "overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI', 109 "overwrite_hyperkube_cni": get_var_as_bool('OVERWRITE_HYPERKUBE_CNI',
113 None), 110 None),