Make sure local e2es use local helm chart

Author: viveksinghggits

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

@@ -300,3 +300,45 @@ def _create_helm_args(helm_args: Dict[str, str], helm_options: Optional[List[str
 
 def _helm_chart_dir(default: Optional[str] = "helm_chart") -> str:
     return os.environ.get("HELM_CHART_DIR", default)
+
+
+# helm_chart_path_and_version returns the chart path and version that we would like to install to run the E2E tests.
+# for local tests it returns early with local helm chart dir and for other scenarios it figure out the chart and version
+# based on the caller. In most of the cases we will install chart from OCI registry but for the tests where we would like
+# to install MEKO's specific version or MCK's specific version, we would expec `helm_chart_path` to set already.
+def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) -> tuple[str, str]:
+    # these are imported here to resolve import cycle issue
+    from tests.conftest import local_operator
+    from tests.conftest import LOCAL_HELM_CHART_DIR
+
+    if local_operator():
+        return LOCAL_HELM_CHART_DIR, ""
+    
+    # if operator_version is not specified and we are not installing the MCK or MEKO chart
+    # it would mean we want to install OCI published helm chart. Figure out respective version,
+    # it is set in env var `OPERATOR_VERSION` based on build_scenario.
+    if not operator_version and helm_chart_path not in (
+        MCK_HELM_CHART,
+        LEGACY_OPERATOR_CHART,
+    ):
+        non_semver_operator_version = os.environ.get(OPERATOR_VERSION_ENV_VAR_NAME)
+        # when we publish the helm chart we append `0.0.0+` in the chart version, details are
+        # here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
+        operator_version = f"0.0.0+{non_semver_operator_version}"
+
+
+    # helm_chart_path not being passed would mean we are on evg env and would like to
+    # install helm chart from OCI registry.
+    if not helm_chart_path:
+        # login to the OCI container registry
+        registry, repository, region = oci_chart_info()
+        try:
+            oci_helm_registry_login(registry, region)
+        except Exception as e:
+            raise e
+
+        # figure out the registry URI, based on dev/staging scenario
+        chart_uri = f"oci://{registry}/{repository}"
+        helm_chart_path = chart_uri
+
+    return helm_chart_path, operator_version

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

@@ -20,6 +20,7 @@
     helm_upgrade,
     oci_chart_info,
     oci_helm_registry_login,
+    helm_chart_path_and_version,
 )
 from tests import test_logger
 
@@ -56,31 +57,7 @@ def __init__(
         # The Operator will be installed from the following repo, so adding it first
         helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
 
-        # helm_chart_path not being passed would mean we are on evg env and would like to
-        # install helm chart from OCI registry.
-        if not helm_chart_path:
-            # login to the OCI container registry
-            registry, repository, region = oci_chart_info()
-            try:
-                oci_helm_registry_login(registry, region)
-            except Exception as e:
-                raise e
-
-            # figure out the registry URI, based on dev/staging scenario
-            chart_uri = f"oci://{registry}/{repository}"
-            helm_chart_path = chart_uri
-
-        # if operator_version is not specified and we are not installing the MCK or MEKO chart
-        # it would mean we want to install OCI published helm chart. Figure out respective version,
-        # it is set in env var `OPERATOR_VERSION` based on build_scenario.
-        if not operator_version and helm_chart_path not in (
-            MCK_HELM_CHART,
-            LEGACY_OPERATOR_CHART,
-        ):
-            non_semver_operator_version = os.environ.get(OPERATOR_VERSION_ENV_VAR_NAME)
-            # when we publish the helm chart we append `0.0.0+` in the chart version, details are
-            # here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
-            operator_version = f"0.0.0+{non_semver_operator_version}"
+        helm_chart_path, operator_version = helm_chart_path_and_version(helm_chart_path, operator_version)        
 
         if helm_args is None:
             helm_args = {}

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

@@ -26,6 +26,7 @@
     helm_repo_add,
     oci_chart_info,
     oci_helm_registry_login,
+    helm_chart_path_and_version,
 )
 from kubetester.kubetester import KubernetesTester
 from kubetester.kubetester import fixture as _fixture
@@ -839,28 +840,7 @@ def _install_multi_cluster_operator(
     # The Operator will be installed from the following repo, so adding it first
     helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
 
-    # helm_chart_path not being passed would mean we are on evg env and would like to
-    # install helm chart from OCI registry.
-    if not helm_chart_path:
-        # login to the OCI container registry
-        registry, repository, region = oci_chart_info()
-        try:
-            oci_helm_registry_login(registry, region)
-        except Exception as e:
-            raise e
-
-        # figure out the registry URI, based on dev/staging scenario
-        chart_uri = f"oci://{registry}/{repository}"
-
-        helm_chart_path = chart_uri
-
-    if not custom_operator_version and helm_chart_path not in (MCK_HELM_CHART, LEGACY_OPERATOR_CHART):
-        # custom_operator_version is not set and chart is also neither MCK nor MEKO would mean we are trying to install
-        # the operator from OCI registry. The version based on build scenario (dev/staging) is set in `OPERATOR_VERSION` env var.
-        non_semver_custom_operator_version = os.environ.get(OPERATOR_VERSION_ENV_VAR_NAME)
-        # when we publish the helm chart we append `0.0.0+` in the chart version, details are
-        # here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
-        custom_operator_version = f"0.0.0+{non_semver_custom_operator_version}"
+    helm_chart_path, custom_operator_version = helm_chart_path_and_version(helm_chart_path, custom_operator_version)
 
     prepare_multi_cluster_namespaces(
         namespace,