Merge pull request #9848 from petr-balogh/test-upgrade-waitTimeoutFor…

…HealthyOSDInMinutes

Allow test upgrade waitTimeoutForHealthyOSDInMinutes

conf/README.md

@@ -313,6 +313,7 @@ higher priority).
       * `nodepool_replicas` - number of replicas of nodepool for each cluster
       * `hosted_odf_registry` - registry for hosted ODF
       * `hosted_odf_version` - version of ODF to be deployed on hosted clusters
+* `wait_timeout_for_healthy_osd_in_minutes` - timeout waiting for healthy OSDs before continuing upgrade (see https://bugzilla.redhat.com/show_bug.cgi?id=2276694 for more details)
 
 #### UPGRADE
 

ocs_ci/deployment/deployment.py

@@ -1513,6 +1513,17 @@ def deploy_ocs_via_operator(self, image=None):
             cluster_data["spec"]["multiCloudGateway"] = {
                 "externalPgConfig": {"pgSecretName": constants.NOOBAA_POSTGRES_SECRET}
             }
+        # To be able to verify: https://bugzilla.redhat.com/show_bug.cgi?id=2276694
+        wait_timeout_for_healthy_osd_in_minutes = config.ENV_DATA.get(
+            "wait_timeout_for_healthy_osd_in_minutes"
+        )
+        if wait_timeout_for_healthy_osd_in_minutes:
+            cluster_data.setdefault("spec", {}).setdefault(
+                "managedResources", {}
+            ).setdefault("cephCluster", {})
+            cluster_data["spec"]["managedResources"]["cephCluster"][
+                "waitTimeoutForHealthyOSDInMinutes"
+            ] = wait_timeout_for_healthy_osd_in_minutes
 
         cluster_data_yaml = tempfile.NamedTemporaryFile(
             mode="w+", prefix="cluster_storage", delete=False