From 931e0d3c7ee3ee687f6a56df38ec8f9fd1cff854 Mon Sep 17 00:00:00 2001 From: Mahesh Shetty Date: Tue, 5 Sep 2023 10:53:00 +0530 Subject: [PATCH] Change post upgrade verification for stretch cluster upgrade tests Signed-off-by: Mahesh Shetty --- ocs_ci/ocs/resources/storage_cluster.py | 8 ++++++++ ocs_ci/utility/rgwutils.py | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/ocs_ci/ocs/resources/storage_cluster.py b/ocs_ci/ocs/resources/storage_cluster.py index 1affd74bb4e2..b4f213d0092c 100644 --- a/ocs_ci/ocs/resources/storage_cluster.py +++ b/ocs_ci/ocs/resources/storage_cluster.py @@ -293,6 +293,14 @@ def ocs_install_verification( } ) + if config.DEPLOYMENT.get("arbiter_deployment") is True: + resources_dict.update( + { + constants.MON_APP_LABEL: 5, + constants.MGR_APP_LABEL: 2, + } + ) + for label, count in resources_dict.items(): if label == constants.RGW_APP_LABEL: if ( diff --git a/ocs_ci/utility/rgwutils.py b/ocs_ci/utility/rgwutils.py index 5821db67e87b..ae83e92e973c 100644 --- a/ocs_ci/utility/rgwutils.py +++ b/ocs_ci/utility/rgwutils.py @@ -24,6 +24,12 @@ def get_rgw_count(ocs_version, is_upgrade, version_before_upgrade): int: RGW Count """ + from ocs_ci.framework import config + + if config.DEPLOYMENT.get("arbiter_deployment") is True: + log.debug("RGW count: 2") + return 2 + semantic_ocs_version = version.get_semantic_version( ocs_version, only_major_minor=True )