Fix e2e_meko_mck_upgrade by using OCI version only when version is not provided and chart is not meko or mck

Author: viveksinghggits

.evergreen.yml

@@ -37,6 +37,8 @@ variables:
         variant: init_test_run
       - name: build_init_om_images_ubi
         variant: init_test_run
+      - name: publish_helm_chart
+        variant: init_test_run
 
   - &base_no_om_image_dependency
     depends_on:

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

@@ -51,6 +51,9 @@ def __init__(
         api_client: Optional[client.api_client.ApiClient] = None,
         operator_version: Optional[str] = None,
     ):
+        # The Operator will be installed from the following repo, so adding it first
+        helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
+
         if not helm_chart_path:
             # login to the OCI container registry
             registry, repository, region = oci_chart_info()
@@ -63,7 +66,7 @@ def __init__(
             chart_uri = f"oci://{registry}/{repository}"
             helm_chart_path = chart_uri
 
-        if not operator_version:
+        if not operator_version and helm_chart_path not in ("mongodb/mongodb-kubernetes", "mongodb/enterprise-operator"):
             # most probably we are trying to install current operator which will be installed
             # from OCI registry. The version (dev/staging) is set in `OPERATOR_VERSION`
             non_semver_operator_version = os.environ.get("OPERATOR_VERSION")

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

@@ -839,7 +839,7 @@ def _install_multi_cluster_operator(
     multi_cluster_operator_installation_config.update(helm_opts)
 
     # The Operator will be installed from the following repo, so adding it first
-    # helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
+    helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
 
     # login to the OCI container registry
     registry, repository, region = oci_chart_info()
@@ -853,7 +853,7 @@ def _install_multi_cluster_operator(
     if not helm_chart_path:
         helm_chart_path = chart_uri
 
-    if not custom_operator_version:
+    if not custom_operator_version and helm_chart_path not in (MCK_HELM_CHART, LEGACY_OPERATOR_CHART):
         # most probably we are trying to install current operator which will be installed
         # from OCI registry. The version (dev/staging) is set in `OPERATOR_VERSION`
         non_semver_custom_operator_version = os.environ.get("OPERATOR_VERSION")