commit a9d08331f7e0c60f23b421d2bfb1ba8040a5a9f9
author vrovachev <vrovachev@mirantis.com> Thu Jun 22 20:01:59 2017 +0400
committer Dennis Dmitriev <dis.xcom@gmail.com> Mon Jun 26 04:35:14 2017 -0400
tree ae048447cca41f75bf99049135ced3fd46b5a795
parent 6238ba561ee90e087b79ef1772e0326ab75535ac

Move run k8s conformance tests to k8s manager.

* Moved step with run k8s conformance tests from template
to k8s manager.
* Added possibility to change k8s conformance image.
* Bumped k8s image version from 1.6.2 to 1.6.4.
* Bumped k8s conformance image version from 1.6.2 to 1.6.4.
* Added possibility to skip conformance tests.

Change-Id: I6e4a3019f8fa6453005fc62614588209114cb02b
Reviewed-on: https://review.gerrithub.io/366656
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Reviewed-by: <apanchenko@mirantis.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 77ed1b0..b475357 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -183,7 +183,7 @@
            default='sbPfel23ZigJF3Bm'),
     ct.Cfg('kubernetes_docker_package', ct.String(), default=''),
     ct.Cfg('kubernetes_hyperkube_image', ct.String(),
-           default='{}/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2'.format(
+           default='{}/mirantis/kubernetes/hyperkube-amd64:v1.6.4-3'.format(
                settings.DOCKER_REGISTRY)),
     ct.Cfg('kubernetes_calico_image', ct.String(),
            default='{}/mirantis/projectcalico/calico/node:latest'.format(
@@ -209,6 +209,11 @@
            help="", default='0.0.0.0'),
     ct.Cfg('kube_apiserver_port', ct.Integer(),
            help="", default=443),
+    ct.Cfg("k8s_conformance_run", ct.Boolean(),
+           default=False),
+    ct.Cfg('k8s_conformance_image', ct.String(),
+           default='docker-dev-virtual.docker.mirantis.net/mirantis/'
+                   'kubernetes/k8s-conformance:v1.6.4-3_1495550936267')
 ]
 
 _group_opts = [