Running search test under OM 8.2

Author: lsierant

.evergreen.yml

@@ -1030,6 +1030,7 @@ 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

docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh

@@ -115,7 +115,7 @@ download_agent() {
     esac
 
     script_log "Downloading Agent version: ${AGENT_VERSION}"
-    script_log "Downloading a Mongodb Agent from ${base_url:?}"
+    script_log "Downloading a Mongodb Agent from ${base_url:?}/download/agent/automation/${AGENT_FILE}"
     curl_opts=(
         "${base_url}/download/agent/automation/${AGENT_FILE}"
 
@@ -133,6 +133,7 @@ download_agent() {
         curl_opts+=("--cacert" "${SSL_TRUSTED_MMS_SERVER_CERTIFICATE}")
     fi
 
+    echo "Executing curl command: curl ${curl_opts[*]}"
     if ! curl "${curl_opts[@]}" &>"${MMS_LOG_DIR}/curl.log"; then
         script_log "Error while downloading the Mongodb agent"
         exit 1

docker/mongodb-kubernetes-tests/kubetester/omtester.py

@@ -21,15 +21,11 @@
 from opentelemetry import trace
 from requests.adapters import HTTPAdapter, Retry
 
+from tests.common.ops_manager.cloud_manager import is_cloud_qa
 from .kubetester import get_env_var_or_fail
 
 
-def running_cloud_manager():
-    "Determines if the current test is running against Cloud Manager"
-    return get_env_var_or_fail("OM_HOST") == "https://cloud-qa.mongodb.com"
-
-
-skip_if_cloud_manager = pytest.mark.skipif(running_cloud_manager(), reason="Do not run in Cloud Manager")
+skip_if_cloud_manager = pytest.mark.skipif(is_cloud_qa(), reason="Do not run in Cloud Manager")
 
 
 class BackupStatus(str, Enum):

docker/mongodb-kubernetes-tests/tests/common/ops_manager/cloud_manager.py

@@ -0,0 +1,5 @@
+import os
+
+
+def is_cloud_qa() -> bool:
+    return os.getenv("ops_manager_version", "cloud_qa") == "cloud_qa"

docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_disaster_recovery.py

@@ -1,4 +1,3 @@
-import os
 import time
 from typing import Optional
 
@@ -12,12 +11,10 @@
     update_configmap,
 )
 from kubetester.kubetester import (
-    KubernetesTester,
     ensure_ent_version,
 )
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.kubetester import (
-    get_env_var_or_fail,
     is_default_architecture_static,
     is_multi_cluster,
     run_periodically,
@@ -29,6 +26,7 @@
 from kubetester.phase import Phase
 from pytest import fixture, mark
 from tests import test_logger
+from tests.common.ops_manager.cloud_manager import is_cloud_qa
 from tests.conftest import (
     MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP,
     get_central_cluster_client,
@@ -54,10 +52,6 @@
 # to reconfigure the deployment further.
 
 
-def is_cloud_qa() -> bool:
-    return os.getenv("ops_manager_version", "cloud_qa") == "cloud_qa"
-
-
 @mark.e2e_multi_cluster_sharded_disaster_recovery
 def test_install_operator(multi_cluster_operator: Operator):
     multi_cluster_operator.assert_is_running()

docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/om_ops_manager_basic.yaml

@@ -15,3 +15,16 @@ spec:
 
   backup:
     enabled: false
+
+  # adding this just to avoid wizard when opening OM UI
+  configuration:
+    automation.versions.source: mongodb
+    mms.adminEmailAddr: [email protected]
+    mms.fromEmailAddr: [email protected]
+    mms.ignoreInitialUiSetup: "true"
+    mms.mail.hostname: email-smtp.us-east-1.amazonaws.com
+    mms.mail.port: "465"
+    mms.mail.ssl: "true"
+    mms.mail.transport: smtp
+    mms.minimumTLSVersion: TLSv1.2
+    mms.replyToEmailAddr: [email protected]

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

@@ -0,0 +1,31 @@
+from typing import Optional
+
+from pytest import fixture
+
+from kubetester import try_load
+from kubetester.opsmanager import MongoDBOpsManager
+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.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment
+
+
+def get_ops_manager(namespace: str) -> Optional[MongoDBOpsManager]:
+    if is_cloud_qa():
+        return None
+
+    resource: MongoDBOpsManager = MongoDBOpsManager.from_yaml(
+        yaml_fixture("om_ops_manager_basic.yaml"), namespace=namespace
+    )
+
+    if try_load(resource):
+        return resource
+
+    resource.set_version(get_custom_om_version())
+    resource.set_appdb_version(get_custom_appdb_version())
+    resource.allow_mdb_rc_versions()
+
+    if is_multi_cluster():
+        enable_multi_cluster_deployment(resource)
+
+    return resource

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

@@ -1,19 +1,26 @@
+from typing import Optional
+
 import pymongo
 import yaml
 from kubetester import create_or_update_secret, try_load
 from kubetester.certs import create_mongodb_tls_certs, create_tls_certs
-from kubetester.kubetester import KubernetesTester
+from kubetester.kubetester import KubernetesTester, is_multi_cluster
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.mongodb import MongoDB
 from kubetester.mongodb_search import MongoDBSearch
 from kubetester.mongodb_user import MongoDBUser
+from kubetester.omtester import skip_if_cloud_manager
+from kubetester.opsmanager import MongoDBOpsManager
 from kubetester.phase import Phase
 from pytest import fixture, mark
 from tests import test_logger
+from tests.common.ops_manager.cloud_manager import is_cloud_qa
 from tests.common.search import movies_search_helper
 from tests.common.search.movies_search_helper import SampleMoviesSearchHelper
 from tests.common.search.search_tester import SearchTester
 from tests.conftest import get_default_operator
+from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment
+from tests.search.om_deployment import get_ops_manager
 
 logger = test_logger.get_test_logger(__name__)
 
@@ -26,7 +33,7 @@
 USER_NAME = "mdb-user"
 USER_PASSWORD = f"{USER_NAME}-password"
 
-MDB_RESOURCE_NAME = "mdb-rs"
+MDB_RESOURCE_NAME = "mdb-ent-tls"
 
 # MongoDBSearch TLS configuration
 MDBS_TLS_SECRET_NAME = "mdbs-tls-secret"
@@ -39,6 +46,7 @@ def mdb(namespace: str, issuer_ca_configmap: str) -> MongoDB:
         name=MDB_RESOURCE_NAME,
         namespace=namespace,
     )
+    resource.configure(om=get_ops_manager(namespace), project_name=MDB_RESOURCE_NAME)
 
     if try_load(resource):
         return resource
@@ -115,6 +123,16 @@ def test_install_operator(namespace: str, operator_installation_config: dict[str
     operator.assert_is_running()
 
 
+@mark.e2e_search_enterprise_tls
+@skip_if_cloud_manager
+def test_create_ops_manager(namespace: str):
+    ops_manager = get_ops_manager(namespace)
+    if ops_manager is not None:
+        ops_manager.update()
+    ops_manager.om_status().assert_reaches_phase(Phase.Running, timeout=1200)
+    ops_manager.appdb_status().assert_reaches_phase(Phase.Running, timeout=600)
+
+
 @mark.e2e_search_enterprise_tls
 def test_install_tls_secrets_and_configmaps(namespace: str, mdb: MongoDB, mdbs: MongoDBSearch, issuer: str):
     create_mongodb_tls_certs(issuer, namespace, mdb.name, f"certs-{mdb.name}-cert", mdb.get_members())

scripts/dev/contexts/variables/om80

@@ -19,3 +19,5 @@ export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 export CUSTOM_APPDB_VERSION=8.0.6-ent
 export TEST_MODE=opsmanager
 export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
+
+export ops_manager_version="${CUSTOM_OM_VERSION}"