Merge "Mark k8s system tests with k8s_system mark"

tcp_tests/tests/system/test_calico.py

@@ -29,6 +29,7 @@ class TestMCPCalico(object):
     """
 
     @pytest.mark.fail_snapshot
+    @pytest.mark.k8s_system
     def test_k8s_netchecker_calico(self, show_step, config, k8s_deployed):
         """Test for deploying k8s environment with Calico plugin and check
            network connectivity between different pods by k8s-netchecker
@@ -50,6 +51,7 @@ def test_k8s_netchecker_calico(self, show_step, config, k8s_deployed):
     @pytest.mark.calico_ci
     @pytest.mark.cz8116
     @pytest.mark.k8s_calico
+    @pytest.mark.k8s_system
     def test_calico_route_recovery(self, show_step, config, underlay,
                                    k8s_deployed):
         """Test for deploying k8s environment with Calico plugin and check
@@ -146,6 +148,7 @@ def test_calico_route_recovery(self, show_step, config, underlay,
 
     @pytest.mark.fail_snapshot
     @pytest.mark.calico_ci
+    @pytest.mark.k8s_system
     def test_calico_network_policies(self, show_step, config, underlay,
                                      k8s_deployed):
         """Test for deploying k8s environment with Calico and check

tcp_tests/tests/system/test_failover_k8s.py

@@ -23,6 +23,7 @@ class TestFailoverK8s(object):
 
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
+    @pytest.mark.k8s_system
     def test_k8s_master_vip_migration(self, show_step, k8s_deployed, underlay,
                                       k8s_actions, core_actions,
                                       config, hardware):

tcp_tests/tests/system/test_k8s_actions.py

@@ -38,6 +38,7 @@ def __read_testdata_yaml(self, name):
     @pytest.mark.fail_snapshot
     @pytest.mark.cz8116
     @pytest.mark.k8s_calico
+    @pytest.mark.k8s_system
     def test_k8s_externaldns_coredns(self, show_step, config, k8s_deployed):
         """Test externaldns integration with coredns
 
@@ -144,6 +145,7 @@ def test_k8s_chain_update(self, show_step, underlay, config, k8s_deployed,
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_metallb
+    @pytest.mark.k8s_system
     def test_k8s_metallb(self, show_step, config, k8s_deployed):
         """Enable metallb in cluster and do basic tests
 
@@ -199,6 +201,7 @@ def test_k8s_metallb(self, show_step, config, k8s_deployed):
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_genie
+    @pytest.mark.k8s_system
     def test_k8s_genie_flannel(self, show_step, config,
                                salt_deployed, k8s_deployed):
         """Test genie-cni+flannel cni setup
@@ -318,6 +321,7 @@ def check_pods_availability():
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_dashboard
+    @pytest.mark.k8s_system
     def test_k8s_dashboard(self, show_step, config,
                            salt_deployed, k8s_deployed):
         """Test dashboard setup
@@ -394,6 +398,7 @@ def dashboard_curl(url, data=None, headers=None):
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_ingress_nginx
+    @pytest.mark.k8s_system
     def test_k8s_ingress_nginx(self, show_step, config,
                                salt_deployed, k8s_deployed):
         """Test ingress-nginx configured and working with metallb

tcp_tests/tests/system/test_virtlet_actions.py

@@ -26,6 +26,7 @@ class TestVirtletActions(object):
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_virtlet
+    @pytest.mark.k8s_system
     def test_virtlet_create_delete_vm(self, show_step, config, k8s_deployed):
         """Test for deploying an mcp environment with virtlet
 
@@ -53,6 +54,7 @@ def test_virtlet_create_delete_vm(self, show_step, config, k8s_deployed):
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_virtlet
+    @pytest.mark.k8s_system
     def test_vm_resource_quotas(self, show_step, config, k8s_deployed):
         """Test for deploying a VM with specific quotas