diff --git a/tests/global_config.py b/tests/global_config.py index 80a0882..6f2c0ad 100644 --- a/tests/global_config.py +++ b/tests/global_config.py @@ -3,9 +3,6 @@ from ocp_resources.datavolume import DataVolume from ocp_resources.deployment import Deployment -from ocp_resources.pod import Pod -from ocp_resources.replica_set import ReplicaSet -from ocp_resources.service import Service from ocp_resources.template import Template from ocp_resources.virtual_machine import VirtualMachine @@ -433,7 +430,6 @@ def _get_default_storage_class(sc_list): cnv_deployment_matrix = ALL_CNV_DEPLOYMENTS cnv_deployment_no_hpp_matrix = ALL_CNV_DEPLOYMENTS_NO_HPP_POOL cnv_daemonset_matrix = ALL_CNV_DAEMONSETS -nmo_removal_matrix = [Service, ReplicaSet, Deployment, Pod] pod_resource_validation_matrix = [{"cpu": 5}, {"memory": None}] cnv_operators_matrix = CNV_OPERATORS cnv_vm_console_proxy_cluster_resource_matrix = VM_CONSOLE_PROXY_CLUSTER_RESOURCES diff --git a/tests/install_upgrade_operators/test_nmo_removal.py b/tests/install_upgrade_operators/test_nmo_removal.py deleted file mode 100644 index ed03d17..0000000 --- a/tests/install_upgrade_operators/test_nmo_removal.py +++ /dev/null @@ -1,22 +0,0 @@ -import pytest - -NODE_MAINTENANCE_OPERATOR = "node-maintenance-operator" - -pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno] - - -@pytest.fixture() -def node_maintenance_resources(admin_client, hco_namespace, nmo_removal_matrix__function__): - return [ - resource.name - for resource in nmo_removal_matrix__function__.get(dyn_client=admin_client, namespace=hco_namespace.name) - if resource.name.startswith(NODE_MAINTENANCE_OPERATOR) - ] - - -@pytest.mark.polarion("CNV-8742") -def test_validate_nmo_removal(hco_namespace, nmo_removal_matrix__function__, node_maintenance_resources): - assert not node_maintenance_resources, ( - f"Following {NODE_MAINTENANCE_OPERATOR} resource: {nmo_removal_matrix__function__} has been found in namespace" - f" {hco_namespace.name}: {node_maintenance_resources}" - )