wip

Author: lsierant

.evergreen.yml

@@ -1030,7 +1030,6 @@ task_groups:
       - e2e_om_feature_controls
       - e2e_vault_setup_om
       - e2e_vault_setup_om_backup
-      - e2e_search_enterprise_tls
     <<: *teardown_group
 
   - name: e2e_static_ops_manager_kind_only_task_group
@@ -1131,6 +1130,15 @@ task_groups:
       - e2e_om_ops_manager_prometheus
     <<: *teardown_group
 
+  # Tests features only supported on OM80
+  - name: e2e_ops_manager_kind_8_0_only_task_group
+    max_hosts: -1
+    <<: *setup_group
+    <<: *setup_and_teardown_task
+    tasks:
+      - e2e_search_enterprise_tls
+    <<: *teardown_group
+
   # Tests features only supported on OM70 and OM80, its only upgrade test as we test upgrading from 6 to 7 or 7 to 8
   - name: e2e_ops_manager_upgrade_only_task_group
     max_hosts: -1
@@ -1341,6 +1349,7 @@ buildvariants:
       - name: e2e_ops_manager_kind_5_0_only_task_group_without_queryable_backup
       - name: e2e_ops_manager_kind_6_0_only_task_group
       - name: e2e_ops_manager_upgrade_only_task_group
+      - name: e2e_ops_manager_kind_8_0_only_task_group
 
   - name: e2e_static_om80_kind_ubi
     display_name: e2e_static_om80_kind_ubi

docker/mongodb-kubernetes-tests/tests/search/om_deployment.py

@@ -1,12 +1,12 @@
 from typing import Optional
 
-from pytest import fixture
-
 from kubetester import try_load
+from kubetester.kubetester import fixture as yaml_fixture
+from kubetester.kubetester import is_multi_cluster
 from kubetester.opsmanager import MongoDBOpsManager
+from pytest import fixture
 from tests.common.ops_manager.cloud_manager import is_cloud_qa
-from kubetester.kubetester import fixture as yaml_fixture, is_multi_cluster
-from tests.conftest import get_custom_om_version, get_custom_appdb_version
+from tests.conftest import get_custom_appdb_version, get_custom_om_version
 from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment
 
 

docker/mongodb-kubernetes-tests/tests/search/search_enterprise_tls.py

@@ -1,8 +1,6 @@
 import pymongo
 import yaml
-from pytest import fixture, mark
-
-from kubetester import create_or_update_secret, try_load
+from kubetester import create_or_update_secret, run_periodically, try_load
 from kubetester.certs import create_mongodb_tls_certs, create_tls_certs
 from kubetester.kubetester import KubernetesTester
 from kubetester.kubetester import fixture as yaml_fixture
@@ -11,6 +9,8 @@
 from kubetester.mongodb_user import MongoDBUser
 from kubetester.omtester import skip_if_cloud_manager
 from kubetester.phase import Phase
+from mypyc.irbuild.function import check_native_override
+from pytest import fixture, mark
 from tests import test_logger
 from tests.common.search import movies_search_helper
 from tests.common.search.search_tester import SearchTester
@@ -192,16 +192,32 @@ def test_create_search_resource(mdbs: MongoDBSearch):
 def test_wait_for_database_resource_ready(mdb: MongoDB):
     mdb.assert_reaches_phase(Phase.Running, timeout=300)
 
-    for idx in range(mdb.get_members()):
-        mongod_config = yaml.safe_load(
-            KubernetesTester.run_command_in_pod_container(
-                f"{mdb.name}-{idx}", mdb.namespace, ["cat", "/data/automation-mongod.conf"]
+
+@mark.e2e_search_enterprise_tls
+def test_wait_for_mongod_parameters(mdb: MongoDB):
+    def check_mongod_parameters():
+        parameters_are_set = True
+        pod_parameters = []
+        for idx in range(mdb.get_members()):
+            mongod_config = yaml.safe_load(
+                KubernetesTester.run_command_in_pod_container(
+                    f"{mdb.name}-{idx}", mdb.namespace, ["cat", "/data/automation-mongod.conf"]
+                )
             )
-        )
-        set_parameter = mongod_config.get("setParameter", {})
-        assert (
-            "mongotHost" in set_parameter and "searchIndexManagementHostAndPort" in set_parameter
-        ), "mongot parameters not found in mongod config"
+            set_parameter = mongod_config.get("setParameter", {})
+            parameters_are_set = parameters_are_set and (
+                "mongotHost" in set_parameter and "searchIndexManagementHostAndPort" in set_parameter
+            )
+            pod_parameters.append(f"pod {idx} setParameter: {set_parameter}")
+
+        return parameters_are_set, f'Not all pods have mongot parameters set:\n{"\n".join(pod_parameters)}'
+
+    run_periodically(lambda: check_mongod_parameters(), timeout=200)
+
+
+@mark.e2e_search_enterprise_tls
+def test_wait_for_database_resource_ready2(mdb: MongoDB):
+    mdb.assert_reaches_phase(Phase.Running, timeout=300)
 
 
 @mark.e2e_search_enterprise_tls
@@ -228,8 +244,8 @@ def test_search_assert_search_query(mdb: MongoDB):
 class TestUpgradeMongod:
     def test_check_polyfilled_role_in_ac(self, mdb: MongoDB):
         custom_roles = mdb.get_automation_config_tester().automation_config.get("roles", [])
-        assert (len(custom_roles) > 0)
-        assert ("searchCoordinator" in [role["role"] for role in custom_roles])
+        assert len(custom_roles) > 0
+        assert "searchCoordinator" in [role["role"] for role in custom_roles]
 
     def test_mongod_version(self, mdb: MongoDB):
         mdb.tester(ca_path=get_issuer_ca_filepath(), use_ssl=True).assert_version(MDB_VERSION_WITHOUT_BUILT_IN_ROLE)
@@ -241,12 +257,14 @@ def test_upgrade_to_mongo_8_2(self, mdb: MongoDB):
 
     def test_check_polyfilled_role_not_in_ac(self, mdb: MongoDB):
         custom_roles = mdb.get_automation_config_tester().automation_config.get("roles", [])
-        assert (len(custom_roles) >= 0)
-        assert ("searchCoordinator" not in [role["role"] for role in custom_roles])
+        assert len(custom_roles) >= 0
+        assert "searchCoordinator" not in [role["role"] for role in custom_roles]
 
     def test_mongod_version_after_upgrade(self, mdb: MongoDB):
         mdb_tester = mdb.tester(ca_path=get_issuer_ca_filepath(), use_ssl=True)
-        mdb_tester.assert_scram_sha_authentication(ADMIN_USER_NAME, ADMIN_USER_PASSWORD, "SCRAM-SHA-256", 1, ssl=True, tlsCAFile=get_issuer_ca_filepath())
+        mdb_tester.assert_scram_sha_authentication(
+            ADMIN_USER_NAME, ADMIN_USER_PASSWORD, "SCRAM-SHA-256", 1, ssl=True, tlsCAFile=get_issuer_ca_filepath()
+        )
         # TODO check why assert version works without auth for 8.0 and not for 8.2
         mdb_tester.assert_version(MDB_VERSION_WITH_BUILT_IN_ROLE)
 
@@ -262,13 +280,19 @@ def get_connection_string(mdb: MongoDB, user_name: str, user_password: str) -> s
 
 def get_admin_sample_movies_helper(mdb):
     return movies_search_helper.SampleMoviesSearchHelper(
-        SearchTester(get_connection_string(mdb, ADMIN_USER_NAME, ADMIN_USER_PASSWORD), use_ssl=True, ca_path=get_issuer_ca_filepath())
+        SearchTester(
+            get_connection_string(mdb, ADMIN_USER_NAME, ADMIN_USER_PASSWORD),
+            use_ssl=True,
+            ca_path=get_issuer_ca_filepath(),
+        )
     )
 
 
 def get_user_sample_movies_helper(mdb):
     return movies_search_helper.SampleMoviesSearchHelper(
-        SearchTester(get_connection_string(mdb, USER_NAME, USER_PASSWORD), use_ssl=True, ca_path=get_issuer_ca_filepath())
+        SearchTester(
+            get_connection_string(mdb, USER_NAME, USER_PASSWORD), use_ssl=True, ca_path=get_issuer_ca_filepath()
+        )
     )