Update k8s-ha-calico template and change conformance approach
Related-PROD: PROD-25978
Change-Id: Ie0e3ef34e5e82f09c845b7fa6befac060a95b805
diff --git a/tcp_tests/tests/system/test_virtlet_actions.py b/tcp_tests/tests/system/test_virtlet_actions.py
index d3b6c27..9ca2fe6 100644
--- a/tcp_tests/tests/system/test_virtlet_actions.py
+++ b/tcp_tests/tests/system/test_virtlet_actions.py
@@ -88,12 +88,16 @@
show_step(4)
vm_pod.delete()
+ @pytest.mark.prepare_log(filepath='/tmp/virtlet-conformance/'
+ 'virtlet_conformance.log')
+ @pytest.mark.merge_xunit(path='/tmp/virtlet-conformance',
+ output='/root/report.xml')
+ @pytest.mark.download(name=['virtlet_conformance.log',
+ 'report.xml'])
@pytest.mark.grab_versions
- @pytest.mark.grab_k8s_results(name=['virtlet_conformance.log',
- 'report.xml'])
@pytest.mark.fail_snapshot
def test_virtlet_conformance(self, show_step, config, k8s_deployed,
- k8s_logs):
+ conformance_helper):
"""Test run of virtlet conformance tests
Scenario:
@@ -102,4 +106,4 @@
"""
show_step(1)
- k8s_deployed.run_virtlet_conformance()
+ k8s_deployed.start_conformance_inside_pod(cnf_type='virtlet')