Merge pull request #10570 from vavuthu/timeout_for_mcp_for_upgade_master

red-hat-storage · Sep 24, 2024 · f55d445 · f55d445
2 parents 1dca83b + 669d86b
commit f55d445
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ocs_ci/utility/deployment.py b/ocs_ci/utility/deployment.py
@@ -163,7 +163,13 @@ def get_and_apply_icsp_from_catalog(image, apply=True, insecure=False):
             and config.ENV_DATA["deployment_type"] == "managed"
         )
         if not managed_ibmcloud:
-            wait_for_machineconfigpool_status("all")
+            num_nodes = (
+                config.ENV_DATA["worker_replicas"]
+                + config.ENV_DATA["master_replicas"]
+                + config.ENV_DATA.get("infra_replicas", 0)
+            )
+            timeout = 2800 if num_nodes > 6 else 1900
+            wait_for_machineconfigpool_status(node_type="all", timeout=timeout)
 
     return icsp_file_dest_location