@@ -54,7 +54,7 @@ def replica_set(
5454) -> MongoDB :
5555 if is_multi_cluster ():
5656 resource = MongoDBMulti .from_yaml (
57- yaml_fixture ("mongodb -multi-cluster.yaml" ),
57+ yaml_fixture ("mongodbmulticluster -multi-cluster.yaml" ),
5858 "multi-replica-set" ,
5959 namespace ,
6060 )
@@ -100,26 +100,26 @@ def replica_set(
100100
101101
102102# Installs the latest officially released version of MEKO, from Quay
103- @mark .e2e_meko_mck_upgrade
103+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
104104def test_install_latest_official_operator (official_meko_operator : Operator , namespace : str ):
105105 official_meko_operator .assert_is_running ()
106106 # Dumping deployments in logs ensures we are using the correct operator version
107107 log_deployments_info (namespace )
108108
109109
110- @mark .e2e_meko_mck_upgrade
110+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
111111def test_install_replicaset (replica_set : MongoDB ):
112112 replica_set .assert_reaches_phase (phase = Phase .Running , timeout = 1000 if is_multi_cluster () else 600 )
113113
114114
115- @mark .e2e_meko_mck_upgrade
115+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
116116def test_downscale_latest_official_operator (namespace : str ):
117117 deployment_name = LEGACY_MULTI_CLUSTER_OPERATOR_NAME if is_multi_cluster () else LEGACY_OPERATOR_NAME
118118 downscale_operator_deployment (deployment_name , namespace )
119119
120120
121121# Upgrade to MCK
122- @mark .e2e_meko_mck_upgrade
122+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
123123def test_upgrade_operator (
124124 namespace : str ,
125125 operator_installation_config ,
@@ -151,19 +151,19 @@ def test_upgrade_operator(
151151 log_deployments_info (namespace )
152152
153153
154- @mark .e2e_meko_mck_upgrade
154+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
155155def test_replicaset_reconciled (replica_set : MongoDB ):
156156 replica_set .assert_abandons_phase (phase = Phase .Running , timeout = 300 )
157157 replica_set .assert_reaches_phase (phase = Phase .Running , timeout = 800 )
158158
159159
160- @mark .e2e_meko_mck_upgrade
160+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
161161def test_uninstall_latest_official_operator (namespace : str ):
162162 helm_uninstall (LEGACY_MULTI_CLUSTER_OPERATOR_NAME if is_multi_cluster () else LEGACY_OPERATOR_NAME )
163163 log_deployments_info (namespace )
164164
165165
166- @mark .e2e_meko_mck_upgrade
166+ @mark .e2e_mongodbmulticluster_meko_mck_upgrade
167167def test_operator_still_running (namespace : str , central_cluster_client : client .ApiClient , member_cluster_names ):
168168 operator_name = MULTI_CLUSTER_OPERATOR_NAME if is_multi_cluster () else OPERATOR_NAME
169169 operator_instance = Operator (
0 commit comments