From 06c256d3834ce198a90504b0c9e9238cea662d6b Mon Sep 17 00:00:00 2001 From: Daniel Osypenko Date: Tue, 9 Apr 2024 18:57:42 +0300 Subject: [PATCH] hosted ODF PackageManifest call fix Signed-off-by: Daniel Osypenko --- ocs_ci/deployment/cnv.py | 2 +- ocs_ci/deployment/helpers/hypershift_base.py | 2 +- ocs_ci/deployment/hosted_cluster.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ocs_ci/deployment/cnv.py b/ocs_ci/deployment/cnv.py index a59884587616..34ce6aa685da 100644 --- a/ocs_ci/deployment/cnv.py +++ b/ocs_ci/deployment/cnv.py @@ -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: diff --git a/ocs_ci/deployment/helpers/hypershift_base.py b/ocs_ci/deployment/helpers/hypershift_base.py index cf984a8258f3..499454b56f08 100644 --- a/ocs_ci/deployment/helpers/hypershift_base.py +++ b/ocs_ci/deployment/helpers/hypershift_base.py @@ -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 diff --git a/ocs_ci/deployment/hosted_cluster.py b/ocs_ci/deployment/hosted_cluster.py index 647269d88cdf..21fe10af8fbc 100644 --- a/ocs_ci/deployment/hosted_cluster.py +++ b/ocs_ci/deployment/hosted_cluster.py @@ -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, @@ -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