diff --git a/ocs_ci/helpers/helpers.py b/ocs_ci/helpers/helpers.py index e5e2ad08467..63f23e77b9e 100644 --- a/ocs_ci/helpers/helpers.py +++ b/ocs_ci/helpers/helpers.py @@ -5030,7 +5030,7 @@ def upgrade_multus_holder_design(): Upgrade multus holder design from ODF4.15 to ODF4.16 """ - if config.ENV_DATA.get("multus_delete_csi_holder_pods"): + if not config.ENV_DATA.get("multus_delete_csi_holder_pods"): return if config.ENV_DATA.get("multus_create_public_net"): add_route_public_nad() diff --git a/ocs_ci/ocs/ocs_upgrade.py b/ocs_ci/ocs/ocs_upgrade.py index ae875b16749..805fe176428 100644 --- a/ocs_ci/ocs/ocs_upgrade.py +++ b/ocs_ci/ocs/ocs_upgrade.py @@ -782,6 +782,7 @@ def run_ocs_upgrade( # in pending state is_all_csvs_succeeded = check_all_csvs_are_succeeded(namespace=namespace) assert is_all_csvs_succeeded, "Not all CSV's are in succeeded state" + upgrade_version = version.get_semantic_version(upgrade_version, True) if ( config.ENV_DATA.get("is_multus_enabled") and upgrade_version == version.VERSION_4_16