Skip to content

Commit 7845472

Browse files
CLOUDP-325334: Remove hardcoding of OM 7.0.12 (#339)
# Summary Removing hardcoding of OM 7.0.12 in DR recovery tests as OM 7.0.17 should have fixed the startup issue by skipping migration checks when OM version has not changed. This patch also hardcodes the OM version in the `e2e_static_kind_olm_ubi` variant because it's the last released OM version for `MEKO 1.33.0`. ## Proof of Work [EVG Patch](https://spruce.mongodb.com/version/689af8f0febc2d0007009286) [EVG Patch with hardcoding OM version in static operator upgrade test](https://spruce.mongodb.com/version/689b351008a76d000731bd40) ## Checklist - [x] Have you linked a jira ticket and/or is the ticket in the title? - [x] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details
1 parent 3d0c8e7 commit 7845472

File tree

6 files changed

+2
-21
lines changed

6 files changed

+2
-21
lines changed

pipeline.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,10 +1458,6 @@ def gather_latest_agent_versions(release: Dict, agent_to_build: str = "") -> Lis
14581458
)
14591459
)
14601460

1461-
# TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests
1462-
# https://jira.mongodb.org/browse/CLOUDP-297377
1463-
agent_versions_to_build.append(("107.0.12.8669-1", "100.10.0"))
1464-
14651461
if agent_to_build != "":
14661462
for agent_tuple in agent_versions_to_build:
14671463
if agent_tuple[0] == agent_to_build:

pipeline_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ def test_build_latest_agent_versions():
163163
latest_agents = gather_latest_agent_versions(release_json)
164164
expected_agents = [
165165
("107.0.11.8645-1", "100.10.0"),
166-
# TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests
167-
# https://jira.mongodb.org/browse/CLOUDP-297377
168-
("107.0.12.8669-1", "100.10.0"),
169166
("12.0.31.7825-1", "100.9.4"),
170167
("13.19.0.8937-1", "100.9.4"),
171168
]

scripts/dev/contexts/e2e_multi_cluster_om_appdb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ script_dir=$(dirname "${script_name}")
88
source "${script_dir}/root-context"
99
source "${script_dir}/variables/om70"
1010

11-
# TODO Remove this once the startup script for OM can handle skipping preflight checks.
12-
# As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario.
13-
# https://jira.mongodb.org/browse/CLOUDP-297377
14-
export CUSTOM_OM_VERSION=7.0.12
15-
1611
export KUBE_ENVIRONMENT_NAME=multi
1712
export CLUSTER_NAME="kind-e2e-cluster-1"
1813
export MEMBER_CLUSTERS="kind-e2e-cluster-1 kind-e2e-cluster-2 kind-e2e-cluster-3"

scripts/dev/contexts/e2e_static_kind_olm_ubi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ script_dir=$(dirname "${script_name}")
88
source "${script_dir}/root-context"
99
source "${script_dir}/variables/om70"
1010

11+
# Using a version of OM that is also available for MEKO (including the related agent images)
12+
export CUSTOM_OM_VERSION=7.0.12
1113
export KUBE_ENVIRONMENT_NAME=kind
1214
export CUSTOM_MDB_PREV_VERSION=4.4.20
1315
export MDB_DEFAULT_ARCHITECTURE=static

scripts/dev/contexts/e2e_static_multi_cluster_om_appdb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ script_dir=$(dirname "${script_name}")
88
source "${script_dir}/root-context"
99
source "${script_dir}/variables/om70"
1010

11-
# TODO Remove this once the startup script for OM can handle skipping preflight checks.
12-
# As it stands now, OM 7.0.13 will fail the preflight checks in a disaster recovery scenario.
13-
# https://jira.mongodb.org/browse/CLOUDP-297377
14-
export CUSTOM_OM_VERSION=7.0.12
15-
1611
export KUBE_ENVIRONMENT_NAME=multi
1712
export CLUSTER_NAME="kind-e2e-cluster-1"
1813
export MEMBER_CLUSTERS="kind-e2e-cluster-1 kind-e2e-cluster-2 kind-e2e-cluster-3"

scripts/release/atomic_pipeline.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,6 @@ def gather_latest_agent_versions(release: Dict) -> List[Tuple[str, str]]:
375375
)
376376
)
377377

378-
# TODO: Remove this once we don't need to use OM 7.0.12 in the OM Multicluster DR tests
379-
# https://jira.mongodb.org/browse/CLOUDP-297377
380-
agent_versions_to_build.append(("107.0.12.8669-1", "100.10.0"))
381-
382378
return sorted(list(set(agent_versions_to_build)))
383379

384380

0 commit comments

Comments
 (0)