Merge "Fix model and tempest runner"
diff --git a/tcp_tests/fixtures/k8s_fixtures.py b/tcp_tests/fixtures/k8s_fixtures.py
index 74a7919..fe744ec 100644
--- a/tcp_tests/fixtures/k8s_fixtures.py
+++ b/tcp_tests/fixtures/k8s_fixtures.py
@@ -84,7 +84,7 @@
 
 
 @pytest.fixture(scope='function')
-def grab_virtlet_results(request, func_name, underlay, k8s_deployed):
+def virtlet_logs(request, func_name, underlay, k8s_deployed):
     """Finalizer to extract virtlet conformance logs"""
 
     grab_virtlet_result = request.keywords.get('grab_virtlet_results', None)
diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 8129f68..dbb81ad 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -254,7 +254,7 @@
            default='sbPfel23ZigJF3Bm'),
     ct.Cfg('kubernetes_docker_package', ct.String(), default=''),
     ct.Cfg('kubernetes_hyperkube_image', ct.String(),
-           default='{}/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2'.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(
@@ -268,9 +268,9 @@
     ct.Cfg('kubernetes_netchecker_enabled', ct.Boolean(),
            help="", default=True),
     ct.Cfg('kubernetes_netchecker_agent_image', ct.String(),
-           default='mirantis/k8s-netchecker-agent:stable'),
+           default='mirantis/k8s-netchecker-agent:latest'),
     ct.Cfg('kubernetes_netchecker_server_image', ct.String(),
-           default='mirantis/k8s-netchecker-server:stable'),
+           default='mirantis/k8s-netchecker-server:latest'),
     ct.Cfg('kubernetes_calico_policy_enabled', ct.Boolean(),
            help="", default=False),
     ct.Cfg('kubernetes_calico_policy_image', ct.String(),
@@ -306,7 +306,7 @@
            default=False),
     ct.Cfg('k8s_conformance_image', ct.String(),
            default='docker-prod-virtual.docker.mirantis.net/mirantis/'
-                   'kubernetes/k8s-conformance:v1.7.5-2')
+                   'kubernetes/k8s-conformance:v1.8.6-5')
 ]
 
 _group_opts = [
diff --git a/tcp_tests/tests/system/test_virtlet_actions.py b/tcp_tests/tests/system/test_virtlet_actions.py
index 21f7454..e0e8011 100644
--- a/tcp_tests/tests/system/test_virtlet_actions.py
+++ b/tcp_tests/tests/system/test_virtlet_actions.py
@@ -92,7 +92,8 @@
     @pytest.mark.grab_versions
     @pytest.mark.grab_virtlet_results(name='virtlet_conformance.log')
     @pytest.mark.fail_snapshot
-    def test_virtlet_conformance(self, show_step, config, k8s_deployed):
+    def test_virtlet_conformance(self, show_step, config, k8s_deployed,
+                                 virtlet_logs):
         """Test run of virtlet conformance tests
 
         Scenario: