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>
diff --git a/tcp_tests/tests/system/test_install_k8s.py b/tcp_tests/tests/system/test_install_k8s.py
index 36f42b8..43980a3 100644
--- a/tcp_tests/tests/system/test_install_k8s.py
+++ b/tcp_tests/tests/system/test_install_k8s.py
@@ -24,7 +24,7 @@
"""Test class for testing Kubernetes deploy"""
@pytest.mark.fail_snapshot
- def test_k8s_install(self, sl_deployed, k8s_deployed):
+ def test_k8s_install(self, config, sl_deployed, k8s_deployed, k8s_actions):
"""Test for deploying MCP environment with k8s+stacklight and check it
Scenario:
@@ -33,12 +33,15 @@
3. Setup compute nodes
4. Setup stack light nodes
5. Setup Kubernetes cluster
+ 6. Run conformance if need
"""
+ if config.k8s_conformance_run:
+ k8s_actions.run_conformance()
LOG.info("*************** DONE **************")
@pytest.mark.fail_snapshot
- def test_only_k8s_install(self, k8s_deployed):
+ def test_only_k8s_install(self, config, k8s_deployed, k8s_actions):
"""Test for deploying MCP environment with k8s and check it
Scenario:
@@ -46,6 +49,9 @@
2. Setup controller nodes
3. Setup compute nodes
4. Setup Kubernetes cluster
+ 5. Run conformance if need
"""
+ if config.k8s_conformance_run:
+ k8s_actions.run_conformance()
LOG.info("*************** DONE **************")
\ No newline at end of file