From 1741301f22941496894aacdf763987573bae0476 Mon Sep 17 00:00:00 2001 From: Mahesh Shetty Date: Wed, 6 Sep 2023 09:07:02 +0530 Subject: [PATCH] fix up Signed-off-by: Mahesh Shetty --- ocs_ci/ocs/constants.py | 4 ++++ ocs_ci/ocs/ocs_upgrade.py | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py index 2a5786e596e7..ce86ef15c772 100644 --- a/ocs_ci/ocs/constants.py +++ b/ocs_ci/ocs/constants.py @@ -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" diff --git a/ocs_ci/ocs/ocs_upgrade.py b/ocs_ci/ocs/ocs_upgrade.py index af650bdfcc57..512768a57fb6 100644 --- a/ocs_ci/ocs/ocs_upgrade.py +++ b/ocs_ci/ocs/ocs_upgrade.py @@ -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 )