Skip to content

Commit

Permalink
fix up
Browse files Browse the repository at this point in the history
Signed-off-by: Mahesh Shetty <[email protected]>
  • Loading branch information
mashetty330 committed Jan 29, 2024
1 parent a4efda9 commit 1741301
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ocs_ci/ocs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,10 @@
MGR_COUNT = 1
MGR_COUNT_415 = 2

# MON COUNT
MON_COUNT = 3
MON_STRETCH_COUNT = 5

# Root Disk size
CURRENT_VM_ROOT_DISK_SIZE = "60"
VM_ROOT_DISK_SIZE = "120"
Expand Down
14 changes: 10 additions & 4 deletions ocs_ci/ocs/ocs_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,21 @@ def verify_image_versions(old_images, upgrade_version, version_before_upgrade):
config.DEPLOYMENT.get("external_mode")
or config.ENV_DATA.get("mcg_only_deployment")
):
mon_count = constants.MON_COUNT
if config.DEPLOYMENT.get("arbiter_deployment") is True:
mon_count = 5

mgr_count = constants.MGR_COUNT
if config.DEPLOYMENT.get("arbiter_deployment") is True or upgrade_version >= parse_version("4.15"):
mgr_count = constants.MGR_COUNT_415

verify_pods_upgraded(
old_images,
selector=constants.MON_APP_LABEL,
count=3,
count=mon_count,
timeout=820,
)
mgr_count = constants.MGR_COUNT_415
if upgrade_version < parse_version("4.15"):
mgr_count = constants.MGR_COUNT

verify_pods_upgraded(
old_images, selector=constants.MGR_APP_LABEL, count=mgr_count
)
Expand Down

0 comments on commit 1741301

Please sign in to comment.