Skip to content

Commit c9eed83

Browse files
filipcirtogfilipcirtog
committed
rename tests
1 parent d66ea7b commit c9eed83

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

‎.evergreen-tasks.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ tasks:
10131013
commands:
10141014
- func: e2e_test
10151015

1016-
- name: e2e_multi_cluster_appdb_s3_based_backup_restore
1016+
- name: e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
10171017
tags: [ "patch-run" ]
10181018
commands:
10191019
- func: e2e_test
@@ -1174,7 +1174,12 @@ tasks:
11741174
commands:
11751175
- func: e2e_test
11761176

1177-
- name: e2e_multi_cluster_om_appdb_no_mesh
1177+
- name: e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
1178+
tags: [ "patch-run" ]
1179+
commands:
1180+
- func: e2e_test
1181+
1182+
- name: e2e_mongodb_multi_cluster_om_appdb_no_mesh
11781183
tags: [ "patch-run" ]
11791184
commands:
11801185
- func: e2e_test

‎.evergreen.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -944,11 +944,11 @@ task_groups:
944944
- e2e_multi_cluster_om_validation
945945
- e2e_multi_cluster_appdb
946946
- e2e_multi_cluster_appdb_cleanup
947-
- e2e_multi_cluster_appdb_s3_based_backup_restore
947+
- e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
948948
- e2e_multi_cluster_appdb_disaster_recovery
949949
- e2e_multi_cluster_appdb_disaster_recovery_force_reconfigure
950950
- e2e_multi_cluster_om_networking_clusterwide
951-
- e2e_multi_cluster_om_appdb_no_mesh
951+
- e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
952952
# Reused OM tests with AppDB Multi-Cluster topology
953953
- e2e_appdb_tls_operator_upgrade_v1_32_to_mck
954954
- e2e_om_appdb_flags_and_config
@@ -999,11 +999,11 @@ task_groups:
999999
- e2e_multi_cluster_om_validation
10001000
- e2e_multi_cluster_appdb
10011001
- e2e_multi_cluster_appdb_cleanup
1002-
- e2e_multi_cluster_appdb_s3_based_backup_restore
1002+
- e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
10031003
- e2e_multi_cluster_appdb_disaster_recovery
10041004
- e2e_multi_cluster_appdb_disaster_recovery_force_reconfigure
10051005
- e2e_multi_cluster_om_networking_clusterwide
1006-
- e2e_multi_cluster_om_appdb_no_mesh
1006+
- e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
10071007
# Reused OM tests with AppDB Multi-Cluster topology
10081008
- e2e_om_appdb_flags_and_config
10091009
- e2e_om_appdb_upgrade

docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py renamed to docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_mongodbmulticluster_appdb_s3_based_backup_restore.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def ops_manager(
9494

9595

9696
@mark.usefixtures("multi_cluster_operator")
97-
@mark.e2e_multi_cluster_appdb_s3_based_backup_restore
97+
@mark.e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
9898
class TestOpsManagerCreation:
9999
"""
100100
name: Ops Manager successful creation with backup and oplog stores enabled
@@ -150,7 +150,7 @@ def test_om_s3_stores(
150150
om_tester.assert_oplog_s3_stores([{"id": S3_OPLOG_NAME, "s3RegionOverride": AWS_REGION}])
151151

152152

153-
@mark.e2e_multi_cluster_appdb_s3_based_backup_restore
153+
@mark.e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
154154
class TestBackupForMongodb:
155155
@fixture(scope="module")
156156
def project_one(

docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py renamed to docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_mongodbmulticluster_om_appdb_no_mesh.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def s3_bucket_oplog(namespace: str, aws_s3_client: AwsS3Client) -> str:
127127
return next(create_s3_bucket_oplog(namespace, aws_s3_client, api_client=get_central_cluster_client()))
128128

129129

130-
@mark.e2e_multi_cluster_om_appdb_no_mesh
130+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
131131
def test_configure_dns(disable_istio):
132132
host_mappings = [
133133
(
@@ -198,12 +198,12 @@ def test_configure_dns(disable_istio):
198198
)
199199

200200

201-
@mark.e2e_multi_cluster_om_appdb_no_mesh
201+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
202202
def test_disable_istio(disable_istio):
203203
logger.info("Istio disabled")
204204

205205

206-
@mark.e2e_multi_cluster_om_appdb_no_mesh
206+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
207207
def test_configure_nginx(namespace: str):
208208
cluster_client = get_central_cluster_client()
209209

@@ -535,12 +535,12 @@ def create_project_config_map(om: MongoDBOpsManager, mdb_name, project_name, cli
535535
create_or_update_configmap(om.namespace, name, data, client)
536536

537537

538-
@mark.e2e_multi_cluster_om_appdb_no_mesh
538+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
539539
def test_deploy_operator(multi_cluster_operator_with_monitored_appdb: Operator):
540540
multi_cluster_operator_with_monitored_appdb.assert_is_running()
541541

542542

543-
@mark.e2e_multi_cluster_om_appdb_no_mesh
543+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
544544
def test_deploy_ops_manager(ops_manager: MongoDBOpsManager):
545545
ops_manager.update()
546546
ops_manager.om_status().assert_reaches_phase(Phase.Running)
@@ -549,34 +549,34 @@ def test_deploy_ops_manager(ops_manager: MongoDBOpsManager):
549549
ops_manager.assert_appdb_monitoring_group_was_created()
550550

551551

552-
@mark.e2e_multi_cluster_om_appdb_no_mesh
552+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
553553
def test_create_mongodb_multi(server_certs: str, mongodb_multi: MongoDBMulti):
554554
mongodb_multi.update()
555555
mongodb_multi.assert_reaches_phase(Phase.Running, timeout=2400, ignore_errors=True)
556556

557557

558558
@skip_if_local
559-
@mark.e2e_multi_cluster_om_appdb_no_mesh
559+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
560560
@pytest.mark.flaky(reruns=100, reruns_delay=6)
561561
def test_add_test_data(mongodb_multi_collection):
562562
mongodb_multi_collection.insert_one(TEST_DATA)
563563

564564

565-
@mark.e2e_multi_cluster_om_appdb_no_mesh
565+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
566566
def test_mdb_backed_up(ops_manager: MongoDBOpsManager):
567567
ops_manager.get_om_tester(project_name="mongodb").wait_until_backup_snapshots_are_ready(expected_count=1)
568568

569569

570570
@skip_if_local
571-
@mark.e2e_multi_cluster_om_appdb_no_mesh
571+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
572572
def test_change_mdb_data(mongodb_multi_collection):
573573
now_millis = time_to_millis(datetime.datetime.now(tz=datetime.UTC))
574574
print("\nCurrent time (millis): {}".format(now_millis))
575575
time.sleep(30)
576576
mongodb_multi_collection.insert_one({"foo": "bar"})
577577

578578

579-
@mark.e2e_multi_cluster_om_appdb_no_mesh
579+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
580580
def test_pit_restore(ops_manager: MongoDBOpsManager):
581581
now_millis = time_to_millis(datetime.datetime.now(tz=datetime.UTC))
582582
print("\nCurrent time (millis): {}".format(now_millis))
@@ -588,7 +588,7 @@ def test_pit_restore(ops_manager: MongoDBOpsManager):
588588
ops_manager.get_om_tester(project_name="mongodb").create_restore_job_pit(pit_millis)
589589

590590

591-
@mark.e2e_multi_cluster_om_appdb_no_mesh
591+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
592592
def test_mdb_ready(mongodb_multi: MongoDBMulti):
593593
# Note: that we are not waiting for the restore jobs to get finished as PIT restore jobs get FINISHED status
594594
# right away.
@@ -598,7 +598,7 @@ def test_mdb_ready(mongodb_multi: MongoDBMulti):
598598

599599

600600
@skip_if_local
601-
@mark.e2e_multi_cluster_om_appdb_no_mesh
601+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
602602
def test_data_got_restored(mongodb_multi_collection):
603603
assert_data_got_restored(TEST_DATA, mongodb_multi_collection, timeout=600)
604604

@@ -609,7 +609,7 @@ def time_to_millis(date_time) -> int:
609609
return pit_millis
610610

611611

612-
@mark.e2e_multi_cluster_om_appdb_no_mesh
612+
@mark.e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
613613
def test_telemetry_configmap(namespace: str):
614614
config = KubernetesTester.read_configmap(namespace, TELEMETRY_CONFIGMAP_NAME)
615615

0 commit comments

Comments
 (0)