Skip to content

[release-4.18] Increase timeout for metallb deployment and storagecluster creation on provider mode #15125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dahorak wants to merge 1 commit into
base: release-4.18
Choose a base branch
from
+19 −6
Open

[release-4.18] Increase timeout for metallb deployment and storagecluster creation on provider mode #15125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ocs_ci/deployment/metallb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def create_metallb_instance(self):
)
templating.dump_data_to_temp_yaml(metallb_inst_data, metallb_inst_file.name)

retry(CommandFailed, tries=3, delay=15)(exec_cmd)(
retry(CommandFailed, tries=18, delay=30)(exec_cmd)(
f"oc apply -f {metallb_inst_file.name}", timeout=240
)

Expand Down Expand Up @@ -383,7 +383,7 @@ def create_ip_address_pool(self):
)
templating.dump_data_to_temp_yaml(ipaddresspool_data, ipaddresspool_file.name)

retry(CommandFailed, tries=3, delay=15)(exec_cmd)(
retry(CommandFailed, tries=12, delay=15)(exec_cmd)(
f"oc apply -f {ipaddresspool_file.name}", timeout=240
)

Expand Down
21 changes: 17 additions & 4 deletions ocs_ci/deployment/provider_client/storage_client_deployment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
wait_for_machineconfigpool_status,
)
from ocs_ci.utility import templating, kms as KMS, version
from ocs_ci.utility.retry import retry
from ocs_ci.deployment.deployment import Deployment, create_catalog_source
from ocs_ci.deployment.baremetal import disks_available_to_cleanup
from ocs_ci.deployment.encryption import (
Expand Down Expand Up @@ -235,8 +236,14 @@ def provider_and_native_client_installation(
templating.dump_data_to_temp_yaml(
storage_cluster_data, constants.OCS_STORAGE_CLUSTER_YAML
)
self.ocp_obj.exec_oc_cmd(
f"apply -f {constants.OCS_STORAGE_CLUSTER_YAML}"
retry(
CommandFailed,
tries=12,
delay=15,
)(
self.ocp_obj.exec_oc_cmd(
f"apply -f {constants.OCS_STORAGE_CLUSTER_YAML}"
)
)
else:
storage_cluster_data = templating.load_yaml(
Expand All @@ -259,8 +266,14 @@ def provider_and_native_client_installation(
templating.dump_data_to_temp_yaml(
storage_cluster_data, constants.OCS_STORAGE_CLUSTER_UPDATED_YAML
)
self.ocp_obj.exec_oc_cmd(
f"apply -f {constants.OCS_STORAGE_CLUSTER_UPDATED_YAML}"
retry(
CommandFailed,
tries=12,
delay=15,
)(
self.ocp_obj.exec_oc_cmd(
f"apply -f {constants.OCS_STORAGE_CLUSTER_UPDATED_YAML}"
)
)

# Creating toolbox pod
Expand Down
Loading