Skip to content

Commit

Permalink
hosted ODF PackageManifest call fix
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Osypenko <[email protected]>
  • Loading branch information
DanielOsypenko committed Apr 10, 2024
1 parent 7bebeee commit 06c256d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ocs_ci/deployment/cnv.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def post_install_verification(self, raise_exception=False):
logger.warning("Not all nodes are in 'Ready' state")
return False

if wait_for_pods_to_be_running(namespace=self.namespace):
if wait_for_pods_to_be_running(namespace=self.namespace, timeout=600):
logger.info("All CNV pods are running")
else:
if raise_exception:
Expand Down
2 changes: 1 addition & 1 deletion ocs_ci/deployment/helpers/hypershift_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def verify_hosted_ocp_cluster_from_provider(self, name):
Returns:
bool: True if hosted OCP cluster is verified, False otherwise
"""
timeout_pods_wait_min = 10
timeout_pods_wait_min = 20
timeout_hosted_cluster_completed_min = 20
timeout_worker_nodes_ready_min = 20

Expand Down
3 changes: 1 addition & 2 deletions ocs_ci/deployment/hosted_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from ocs_ci.ocs.resources.csv import check_all_csvs_are_succeeded
from ocs_ci.ocs.resources.packagemanifest import (
PackageManifest,
get_selector_for_ocs_operator,
)
from ocs_ci.ocs.resources.pod import (
wait_for_pods_to_be_in_statuses_concurrently,
Expand Down Expand Up @@ -916,8 +915,8 @@ def create_subscription(self):

default_channel = PackageManifest(
resource_name=constants.OCS_CLIENT_OPERATOR,
selector=get_selector_for_ocs_operator(),
cluster_kubeconfig=self.cluster_kubeconfig,
namespace=constants.MARKETPLACE_NAMESPACE,
).get_default_channel()

subscription_data["spec"]["channel"] = default_channel
Expand Down

0 comments on commit 06c256d

Please sign in to comment.