commit 86fc2a47d772e38238f1d063a600f4827c19ddee
author Tatyanka Leontovich <tleontovich@mirantis.com> Thu Jun 21 13:57:46 2018 +0000
committer Gerrit Code Review <support@gerrithub.io> Thu Jun 21 13:57:46 2018 +0000
tree 7488385aa8c1d72f2be431d026b5adf0b3a4ab7f
parent 5175d9e9f27e1f4e4cdcd7bae99807463f288172
parent 2e8e8ee13ef7f6c2b64ea0dfd901e0024cc65bff

Merge "fix ci"

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 52af7db..8bd2b50 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -361,9 +361,9 @@
            default=False),
     ct.Cfg('k8s_conformance_image', ct.String(),
            default='docker-prod-virtual.docker.mirantis.net/mirantis/'
-                   'kubernetes/k8s-conformance:v1.8.13-11'),
+                   'kubernetes/k8s-conformance:v1.10.4-4'),
     ct.Cfg('k8s_update_chain', ct.String(),
-           default='v1.9.8-4 v1.10.3-3')
+           default='v1.9.8-4 v1.10.4-4')
 ]
 
 day1_cfg_config_opts = [