commit 87700e9b9df2e836423450bb5c95f4ea6dc6a7fb
author Tatyanka Leontovich <tleontovich@mirantis.com> Thu Mar 08 05:36:14 2018 -0500
committer Gerrit Code Review <support@gerrithub.io> Thu Mar 08 05:36:14 2018 -0500
tree 7c43feb7d5c6f985647ac9e3515bd9c4257c8e0b
parent 36186ad65cc1330930f162bdafdc3a287d878e45
parent 5e37fecd0424fb4853c62f7440c267b93ece6a2a

Merge "Revert "Bump k8s to 1.8.8-6""

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 4c9e46f..ad4cce3 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -268,7 +268,7 @@
            default='sbPfel23ZigJF3Bm'),
     ct.Cfg('kubernetes_docker_package', ct.String(), default=''),
     ct.Cfg('kubernetes_hyperkube_image', ct.String(),
-           default='{}/mirantis/kubernetes/hyperkube-amd64:v1.8.6-6'.format(
+           default='{}/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_image', ct.String(),
            default='{}/mirantis/projectcalico/calico/node:latest'.format(
@@ -320,7 +320,7 @@
            default=False),
     ct.Cfg('k8s_conformance_image', ct.String(),
            default='docker-prod-virtual.docker.mirantis.net/mirantis/'
-                   'kubernetes/k8s-conformance:v1.8.6-6')
+                   'kubernetes/k8s-conformance:v1.8.6-5')
 ]
 
 _group_opts = [