Removed any changes to the existing tests

Author: lsierant

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

@@ -20,11 +20,16 @@
 from kubetester.om_queryable_backups import OMQueryableBackup
 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
 
-skip_if_cloud_manager = pytest.mark.skipif(is_cloud_qa(), reason="Do not run in Cloud Manager")
+
+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")
 
 
 class BackupStatus(str, Enum):

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

@@ -12,10 +12,12 @@
     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,
@@ -27,7 +29,6 @@
 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,
@@ -53,6 +54,10 @@
 # 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/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py

@@ -1,24 +1,28 @@
-from typing import Dict
+from typing import Dict, Optional
 
 import pytest
-from kubetester import read_configmap, try_load
-from kubetester.certs import create_mongodb_tls_certs, create_sharded_cluster_certs
+from kubeobject import CustomObject
+from kubernetes import client
+from kubetester import create_or_update_configmap, read_configmap
+from kubetester.certs import create_sharded_cluster_certs
+from kubetester.kubetester import ensure_nested_objects
 from kubetester.kubetester import fixture as yaml_fixture
 from kubetester.mongodb import MongoDB
-from kubetester.mongotester import ReplicaSetTester, ShardedClusterTester
+from kubetester.mongotester import ShardedClusterTester
+from kubetester.operator import Operator
 from kubetester.phase import Phase
 from tests import test_logger
 from tests.conftest import (
     LEGACY_OPERATOR_NAME,
     OPERATOR_NAME,
+    get_central_cluster_client,
     get_default_operator,
     install_legacy_deployment_state_meko,
     log_deployments_info,
 )
 from tests.upgrades import downscale_operator_deployment
 
 MDB_RESOURCE = "sh001-base"
-MDB_RS_RESOURCE = "rs"
 CERT_PREFIX = "prefix"
 
 logger = test_logger.get_test_logger(__name__)
@@ -37,8 +41,6 @@
 If the sharded cluster resource correctly reconciles after upgrade/downgrade and scaling steps, we assume it works
 correctly.
 """
-
-
 # TODO CLOUDP-318100: this test should eventually be updated and not pinned to 1.27 anymore
 
 
@@ -66,7 +68,7 @@ def server_certs(issuer: str, namespace: str) -> str:
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture(scope="module")
 def sharded_cluster(
     issuer_ca_configmap: str,
     namespace: str,
@@ -77,46 +79,15 @@ def sharded_cluster(
         yaml_fixture("sharded-cluster.yaml"),
         namespace=namespace,
         name=MDB_RESOURCE,
-    ).configure(om=None, project_name=MDB_RESOURCE)
-
-    if try_load(resource):
-        return resource
-
+    )
     resource.set_version(custom_mdb_version)
     resource["spec"]["mongodsPerShardCount"] = 2
     resource["spec"]["configServerCount"] = 2
     resource["spec"]["mongosCount"] = 1
     resource["spec"]["persistent"] = True
     resource.configure_custom_tls(issuer_ca_configmap, CERT_PREFIX)
 
-    return resource
-
-
-@pytest.fixture(scope="module")
-def replica_set_certs(issuer: str, namespace: str):
-    return create_mongodb_tls_certs(issuer, namespace, MDB_RS_RESOURCE, f"prefix-{MDB_RS_RESOURCE}-cert")
-
-
-@pytest.fixture(scope="module")
-def replica_set(
-    issuer_ca_configmap: str,
-    namespace: str,
-    replica_set_certs: str,
-    custom_mdb_version: str,
-):
-    resource = MongoDB.from_yaml(
-        yaml_fixture("replica-set-basic.yaml"),
-        namespace=namespace,
-        name=MDB_RS_RESOURCE,
-    ).configure(om=None, project_name=f"{MDB_RS_RESOURCE}")
-
-    if try_load(resource):
-        return resource
-
-    resource.set_version(custom_mdb_version)
-    resource.configure_custom_tls(issuer_ca_configmap, CERT_PREFIX)
-
-    return resource
+    return resource.update()
 
 
 @pytest.mark.e2e_sharded_cluster_operator_upgrade_v1_27_to_mck
@@ -130,23 +101,16 @@ def test_install_legacy_deployment_state_meko(
         install_legacy_deployment_state_meko(namespace, managed_security_context, operator_installation_config)
 
     def test_create_sharded_cluster(self, sharded_cluster: MongoDB):
-        sharded_cluster.update()
         sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=350)
 
     def test_scale_up_sharded_cluster(self, sharded_cluster: MongoDB):
+        sharded_cluster.load()
         sharded_cluster["spec"]["mongodsPerShardCount"] = 3
         sharded_cluster["spec"]["configServerCount"] = 3
         sharded_cluster.update()
         sharded_cluster.assert_reaches_phase(phase=Phase.Running, timeout=300)
 
 
-@pytest.mark.e2e_sharded_cluster_operator_upgrade_v1_27_to_mck
-class TestReplicaSetDeployment:
-    def test_create_replica_set(self, replica_set: MongoDB):
-        replica_set.update()
-        replica_set.assert_reaches_phase(phase=Phase.Running, timeout=350)
-
-
 @pytest.mark.e2e_sharded_cluster_operator_upgrade_v1_27_to_mck
 class TestOperatorUpgrade:
 
@@ -173,12 +137,6 @@ def test_sharded_cluster_reconciled(self, sharded_cluster: MongoDB, namespace: s
     def test_assert_connectivity(self, ca_path: str):
         ShardedClusterTester(MDB_RESOURCE, 1, ssl=True, ca_path=ca_path).assert_connectivity()
 
-    def test_replica_set_reconciled(self, replica_set: MongoDB):
-        replica_set.assert_reaches_phase(phase=Phase.Running, timeout=850, ignore_errors=True)
-
-    def test_assert_connectivity_replica_set(self, ca_path: str):
-        ReplicaSetTester(MDB_RS_RESOURCE, 3, ssl=True, ca_path=ca_path).assert_connectivity()
-
     def test_scale_down_sharded_cluster(self, sharded_cluster: MongoDB, namespace: str):
         sharded_cluster.load()
         # Scale down both by 1
@@ -210,12 +168,6 @@ def test_sharded_cluster_reconciled(self, sharded_cluster: MongoDB):
     def test_assert_connectivity(self, ca_path: str):
         ShardedClusterTester(MDB_RESOURCE, 1, ssl=True, ca_path=ca_path).assert_connectivity()
 
-    def test_replica_set_reconciled(self, replica_set: MongoDB):
-        replica_set.assert_reaches_phase(phase=Phase.Running, timeout=850, ignore_errors=True)
-
-    def test_assert_connectivity_replica_set(self, ca_path: str):
-        ReplicaSetTester(MDB_RS_RESOURCE, 3, ssl=True, ca_path=ca_path).assert_connectivity()
-
     def test_scale_up_sharded_cluster(self, sharded_cluster: MongoDB):
         sharded_cluster.load()
         sharded_cluster["spec"]["mongodsPerShardCount"] = 3