Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 46 additions & 41 deletions .evergreen-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ tasks:
commands:
- func: "e2e_test"

- name: e2e_meko_mck_upgrade
- name: e2e_mongodbmulticluster_meko_mck_upgrade
tags: [ "patch-run" ]
commands:
- func: "e2e_test"
Expand Down Expand Up @@ -250,7 +250,7 @@ tasks:
commands:
- func: "e2e_test"

- name: e2e_mongodb_custom_roles
- name: e2e_mongodbmulticluster_custom_roles
tags: [ "patch-run" ]
commands:
- func: "e2e_test"
Expand Down Expand Up @@ -922,77 +922,77 @@ tasks:
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set
- name: e2e_mongodbmulticluster_multi_cluster_replica_set
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_migration
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_migration
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_member_options
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_member_options
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_scale_up
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_scale_up
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_scale_up_cluster
- name: e2e_mongodbmulticluster_multi_cluster_scale_up_cluster
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_scale_up_cluster_new_cluster
- name: e2e_mongodbmulticluster_multi_cluster_scale_up_cluster_new_cluster
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_scale_down_cluster
- name: e2e_mongodbmulticluster_multi_cluster_scale_down_cluster
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_scale_down
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_scale_down
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_deletion
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_deletion
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_mtls_test
- name: e2e_mongodbmulticluster_multi_cluster_mtls_test
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_scram
- name: e2e_mongodbmulticluster_multi_cluster_scram
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_sts_override
- name: e2e_mongodbmulticluster_multi_sts_override
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_tls_with_scram
- name: e2e_mongodbmulticluster_multi_cluster_tls_with_scram
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_enable_tls
- name: e2e_mongodbmulticluster_multi_cluster_enable_tls
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_upgrade_downgrade
- name: e2e_mongodbmulticluster_multi_cluster_upgrade_downgrade
tags: [ "patch-run" ]
commands:
- func: e2e_test
Expand All @@ -1003,22 +1003,22 @@ tasks:
commands:
- func: e2e_test

- name: e2e_multi_cluster_tls_no_mesh
- name: e2e_mongodbmulticluster_multi_cluster_tls_no_mesh
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_backup_restore
- name: e2e_mongodbmulticluster_multi_cluster_backup_restore
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_appdb_s3_based_backup_restore
- name: e2e_mongodbmulticluster_multi_cluster_appdb_s3_based_backup_restore
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_backup_restore_no_mesh
- name: e2e_mongodbmulticluster_multi_cluster_backup_restore_no_mesh
tags: [ "patch-run" ]
commands:
- func: e2e_test
Expand All @@ -1043,78 +1043,78 @@ tasks:
commands:
- func: e2e_test

- name: e2e_multi_cluster_tls_with_x509
- name: e2e_mongodbmulticluster_multi_cluster_tls_with_x509
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_with_ldap
- name: e2e_mongodbmulticluster_multi_cluster_with_ldap
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_with_ldap_custom_roles
- name: e2e_mongodbmulticluster_multi_cluster_with_ldap_custom_roles
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_specific_namespaces
- name: e2e_mongodbmulticluster_multi_cluster_specific_namespaces
tags: [ "patch-run" ]
commands:
- func: e2e_test

# TODO: not used in any variant
- name: e2e_multi_cluster_clusterwide
- name: e2e_mongodbmulticluster_multi_cluster_clusterwide
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_disaster_recovery
- name: e2e_mongodbmulticluster_multi_cluster_disaster_recovery
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_multi_disaster_recovery
- name: e2e_mongodbmulticluster_multi_cluster_multi_disaster_recovery
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_2_clusters_replica_set
- name: e2e_mongodbmulticluster_multi_cluster_2_clusters_replica_set
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_2_clusters_clusterwide
- name: e2e_mongodbmulticluster_multi_cluster_2_clusters_clusterwide
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_recover
- name: e2e_mongodbmulticluster_multi_cluster_recover
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_recover_network_partition
- name: e2e_mongodbmulticluster_multi_cluster_recover_network_partition
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_recover_clusterwide
- name: e2e_mongodbmulticluster_multi_cluster_recover_clusterwide
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_agent_flags
- name: e2e_mongodbmulticluster_multi_cluster_agent_flags
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_replica_set_ignore_unknown_users
- name: e2e_mongodbmulticluster_multi_cluster_replica_set_ignore_unknown_users
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_validation
- name: e2e_mongodbmulticluster_multi_cluster_validation
tags: [ "patch-run" ]
commands:
- func: e2e_test
Expand Down Expand Up @@ -1174,18 +1174,23 @@ tasks:
commands:
- func: e2e_test

- name: e2e_multi_cluster_om_appdb_no_mesh
- name: e2e_mongodbmulticluster_multi_cluster_om_appdb_no_mesh
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_pvc_resize
- name: e2e_mongodb_multi_cluster_om_appdb_no_mesh
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_mongodbmulticluster_multi_cluster_pvc_resize
tags: [ "patch-run" ]
commands:
- func: e2e_test

# this test is run, with an operator with race enabled
- name: e2e_om_reconcile_race_with_telemetry
- name: e2e_mongodbmulticluster_om_reconcile_race_with_telemetry
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should only modify tests that test MongoDBMultiCluster CRD. This one seems to be only about Ops Manager. I don't think we should touch this test.

Or am I missing something?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some tests which use MongoDBMulti in a different way. For example, they aren't centered on testing MongoDBMulti but rather as a supporting component. These tests use MongoDBMulti as a resource to test functionalities such as backup and restore workflows, Ops Manager integration, or multi-cluster configurations without focusing on MongoDBMulti itself. I’ve attached such tests below (description using AI) :

multicluster/multi_cluster_reconcile_races.py - This test validates the MongoDB Kubernetes Operator's ability to reconcile resources reliably across multi-cluster environments while detecting data races and ensuring telemetry correctness.

multicluster_om/multicluster_om_appdb_no_mesh.py - This test validates the Multi-Cluster MongoDB Kubernetes Operator when deployed without Service Mesh, focusing on its ability to manage MongoDBMulti resources with TLS security, S3 backups, external app database monitoring, external connectivity, data restoration via restores, and telemetry validation.

multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py - This test validates the MongoDB Kubernetes Operator in a multi-cluster environment with S3-backed backups and restores, ensuring Ops Manager is properly configured with cluster-level TLS, external connectivity, and custom DNS settings while verifying metadata stores, restore functionality, and backup consistency for MongoDBMulti resources.

While leaving them alone and just replacing MongoDBMultiCluster with MongoDB once the feature branch is merged is one possibility, I would consider replicating them as well in order to be on the safe side. As a result, it’s safer to leave these tests untouched (aside from changes such as renaming and library inclusion for multicluster/multi_cluster_reconcile_races.py) while creating new, identical tests for MongoDB. This approach also makes it easier to delete them once the resource is deprecated.

Additionally, multicluster_om/multicluster_om_appdb_no_mesh.py and multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py will not adopt the library-based approach, as these tests are unique within their respective folders (being the only tests utilizing MongoDBMulti) and will simply be replicated as is.

tags: [ "patch-run" ]
commands:
- func: e2e_test
Expand Down Expand Up @@ -1268,12 +1273,12 @@ tasks:
commands:
- func: e2e_test

- name: e2e_multi_cluster_oidc_m2m_group
- name: e2e_mongodbmulticluster_multi_cluster_oidc_m2m_group
tags: [ "patch-run" ]
commands:
- func: e2e_test

- name: e2e_multi_cluster_oidc_m2m_user
- name: e2e_mongodbmulticluster_multi_cluster_oidc_m2m_user
tags: [ "patch-run" ]
commands:
- func: e2e_test
Expand Down
Loading
Loading