diff --git a/pipeline.py b/pipeline.py index 2aac7fe40..d07c4efb1 100755 --- a/pipeline.py +++ b/pipeline.py @@ -1458,10 +1458,6 @@ def gather_latest_agent_versions(release: Dict, agent_to_build: str = "") -> Lis ) ) - # TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests - # https://jira.mongodb.org/browse/CLOUDP-297377 - agent_versions_to_build.append(("107.0.12.8669-1", "100.10.0")) - if agent_to_build != "": for agent_tuple in agent_versions_to_build: if agent_tuple[0] == agent_to_build: diff --git a/pipeline_test.py b/pipeline_test.py index dab707faa..516801210 100644 --- a/pipeline_test.py +++ b/pipeline_test.py @@ -163,9 +163,6 @@ def test_build_latest_agent_versions(): latest_agents = gather_latest_agent_versions(release_json) expected_agents = [ ("107.0.11.8645-1", "100.10.0"), - # TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests - # https://jira.mongodb.org/browse/CLOUDP-297377 - ("107.0.12.8669-1", "100.10.0"), ("12.0.31.7825-1", "100.9.4"), ("13.19.0.8937-1", "100.9.4"), ] diff --git a/scripts/dev/contexts/e2e_multi_cluster_om_appdb b/scripts/dev/contexts/e2e_multi_cluster_om_appdb index 31e68b112..720faedb3 100644 --- a/scripts/dev/contexts/e2e_multi_cluster_om_appdb +++ b/scripts/dev/contexts/e2e_multi_cluster_om_appdb @@ -8,11 +8,6 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" source "${script_dir}/variables/om70" -# TODO Remove this once the startup script for OM can handle skipping preflight checks. -# As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario. -# https://jira.mongodb.org/browse/CLOUDP-297377 -export CUSTOM_OM_VERSION=7.0.12 - export KUBE_ENVIRONMENT_NAME=multi export CLUSTER_NAME="kind-e2e-cluster-1" export MEMBER_CLUSTERS="kind-e2e-cluster-1 kind-e2e-cluster-2 kind-e2e-cluster-3" diff --git a/scripts/dev/contexts/e2e_static_kind_olm_ubi b/scripts/dev/contexts/e2e_static_kind_olm_ubi index e9f965a2d..47357224f 100644 --- a/scripts/dev/contexts/e2e_static_kind_olm_ubi +++ b/scripts/dev/contexts/e2e_static_kind_olm_ubi @@ -8,6 +8,8 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" source "${script_dir}/variables/om70" +# Using a version of OM that is also available for MEKO (including the related agent images) +export CUSTOM_OM_VERSION=7.0.12 export KUBE_ENVIRONMENT_NAME=kind export CUSTOM_MDB_PREV_VERSION=4.4.20 export MDB_DEFAULT_ARCHITECTURE=static diff --git a/scripts/dev/contexts/e2e_static_multi_cluster_om_appdb b/scripts/dev/contexts/e2e_static_multi_cluster_om_appdb index 5a0828ae2..f5557ae2c 100644 --- a/scripts/dev/contexts/e2e_static_multi_cluster_om_appdb +++ b/scripts/dev/contexts/e2e_static_multi_cluster_om_appdb @@ -8,11 +8,6 @@ script_dir=$(dirname "${script_name}") source "${script_dir}/root-context" source "${script_dir}/variables/om70" -# TODO Remove this once the startup script for OM can handle skipping preflight checks. -# As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario. -# https://jira.mongodb.org/browse/CLOUDP-297377 -export CUSTOM_OM_VERSION=7.0.12 - export KUBE_ENVIRONMENT_NAME=multi export CLUSTER_NAME="kind-e2e-cluster-1" export MEMBER_CLUSTERS="kind-e2e-cluster-1 kind-e2e-cluster-2 kind-e2e-cluster-3" diff --git a/scripts/release/atomic_pipeline.py b/scripts/release/atomic_pipeline.py index 3fee2cfe6..8b0a1a600 100755 --- a/scripts/release/atomic_pipeline.py +++ b/scripts/release/atomic_pipeline.py @@ -495,8 +495,4 @@ def gather_latest_agent_versions(release: Dict) -> List[Tuple[str, str]]: ) ) - # TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests - # https://jira.mongodb.org/browse/CLOUDP-297377 - agent_versions_to_build.append(("107.0.12.8669-1", "100.10.0")) - return sorted(list(set(agent_versions_to_build)))