Allow for more than one deployment per test under cloud-qa

Author: lsierant

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

@@ -250,7 +250,18 @@ def __repr__(self):
 
     def configure(
         self,
-        om: MongoDBOpsManager,
+        om: Optional[MongoDBOpsManager],
+        project_name: str,
+        api_client: Optional[client.ApiClient] = None,
+    ) -> MongoDB:
+        if om is not None:
+            return self.configure_ops_manager(om, project_name, api_client=api_client)
+        else:
+            return self.configure_cloud_qa(project_name, api_client=api_client)
+
+    def configure_ops_manager(
+        self,
+        om: Optional[MongoDBOpsManager],
         project_name: str,
         api_client: Optional[client.ApiClient] = None,
     ) -> MongoDB:
@@ -267,6 +278,37 @@ def configure(
         self["spec"]["credentials"] = om.api_key_secret(self.namespace, api_client=api_client)
         return self
 
+    def configure_cloud_qa(
+        self,
+        project_name,
+        src_project_config_map_name: str = None,
+        api_client: Optional[client.ApiClient] = None,
+    ) -> MongoDB:
+        if "opsManager" in self["spec"]:
+            del self["spec"]["opsManager"]
+
+        ensure_nested_objects(self, ["spec", "cloudManager", "configMapRef"])
+
+        if src_project_config_map_name is None and "cloudManager" in self["spec"]:
+            src_project_config_map_name = self["spec"]["cloudManager"]["configMapRef"]["name"]
+
+        try:
+            src_cm = read_configmap(self.namespace, src_project_config_map_name, api_client=api_client)
+        except client.ApiException as e:
+            if e.status == 404:
+                logger.debug("project config map is not specified, trying my-project as the source")
+                src_cm = read_configmap(self.namespace, "my-project", api_client=api_client)
+            else:
+                raise e
+
+        new_project_config_map_name = f"{self.name}-project-config"
+        self["spec"]["cloudManager"]["configMapRef"]["name"] = new_project_config_map_name
+
+        src_cm.update({"projectName": f"{self.namespace}-{project_name}"})
+        create_or_update_configmap(self.namespace, new_project_config_map_name, src_cm, api_client=api_client)
+
+        return self
+
     def configure_backup(self, mode: str = "enabled") -> MongoDB:
         ensure_nested_objects(self, ["spec", "backup"])
         self["spec"]["backup"]["mode"] = mode

docker/mongodb-kubernetes-tests/tests/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py

@@ -79,7 +79,8 @@ def sharded_cluster(
         yaml_fixture("sharded-cluster.yaml"),
         namespace=namespace,
         name=MDB_RESOURCE,
-    )
+    ).configure(om=None, project_name=MDB_RESOURCE)
+
     resource.set_version(custom_mdb_version)
     resource["spec"]["mongodsPerShardCount"] = 2
     resource["spec"]["configServerCount"] = 2