Skip to content

Commit 123ee04

Browse files
authored
Merge pull request #12019 from openshift-cherrypick-robot/cherry-pick-12016-to-release-4.17
[release-4.17] mirror images using ocs version instead of ocp version
2 parents cced27f + 0af65a4 commit 123ee04

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ocs_ci/deployment/disconnected.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
)
2828
from ocs_ci.utility.version import (
2929
get_semantic_ocp_running_version,
30+
get_semantic_ocs_version_from_config,
3031
VERSION_4_10,
3132
)
3233

@@ -356,7 +357,7 @@ def prepare_disconnected_ocs_deployment(upgrade=False):
356357
or None (for live deployment)
357358
358359
"""
359-
360+
ocs_version = get_semantic_ocs_version_from_config()
360361
if config.DEPLOYMENT.get("stage_rh_osbs"):
361362
raise NotImplementedError(
362363
"Disconnected installation from stage is not implemented!"
@@ -431,7 +432,7 @@ def prepare_disconnected_ocs_deployment(upgrade=False):
431432

432433
mirrored_index_image = mirror_index_image_via_oc_mirror(
433434
index_image,
434-
constants.DISCON_CL_REQUIRED_PACKAGES_PER_ODF_VERSION[get_ocp_version()],
435+
constants.DISCON_CL_REQUIRED_PACKAGES_PER_ODF_VERSION[f"{ocs_version}"],
435436
icsp,
436437
)
437438
logger.debug(f"mirrored_index_image: {mirrored_index_image}")

0 commit comments

Comments
 (0)