diff --git a/ocs_ci/framework/conf/default_config.yaml b/ocs_ci/framework/conf/default_config.yaml index 56637adf82d..4db39aa2863 100644 --- a/ocs_ci/framework/conf/default_config.yaml +++ b/ocs_ci/framework/conf/default_config.yaml @@ -364,5 +364,5 @@ MULTICLUSTER: active_acm_cluster: False PREUPGRADE_CONFIG: - AUTH: null - MULTICLUSTER: null \ No newline at end of file + AUTH: null + MULTICLUSTER: null diff --git a/ocs_ci/ocs/ocs_upgrade.py b/ocs_ci/ocs/ocs_upgrade.py index c4b2cabe9de..8532293f76d 100644 --- a/ocs_ci/ocs/ocs_upgrade.py +++ b/ocs_ci/ocs/ocs_upgrade.py @@ -390,9 +390,8 @@ def get_csv_name_pre_upgrade(self, resource_name=OCS_OPERATOR_NAME): "ocs_version" ) in csv.get("metadata").get("name"): csv_name = csv.get("metadata").get("name") - if not csv_name: - raise CSVNotFound(f"No preupgrade CSV found for {resource_name}") - return csv_name + return csv_name + raise CSVNotFound(f"No preupgrade CSV found for {resource_name}") def get_pre_upgrade_image(self, csv_name_pre_upgrade): """