From 4f9a152f6b848a276a7fcd0fc0fa91756c177312 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Wed, 12 Mar 2025 15:17:40 +0100 Subject: [PATCH] CI: remove timeout for OC CN deployments/undeployments Default value of timeout is 5 minutes. --- ci-scripts/cls_cluster.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 7293e252a1..2ac35a610a 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -72,8 +72,8 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path): succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace) if not succeeded: return False, CONST.OC_LOGIN_FAIL - cmd.run('helm uninstall oai5gcn --wait --timeout 60s') - ret = cmd.run(f'helm install --wait --timeout 120s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.') + cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait') + ret = cmd.run(f'helm install --wait oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.') if ret.returncode != 0: logging.error('OC OAI CN5G: Deployment failed') OC_logout(cmd) @@ -100,10 +100,10 @@ def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path): cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &') cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log') cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip') - ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn') + ret = cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait') if ret.returncode != 0: logging.error('OC OAI CN5G: Undeployment failed') - cmd.run('helm uninstall --wait --timeout 60s oai5gcn') + cmd.run(f'helm list -aq -n {ocNamespace} | xargs -r helm uninstall -n {ocNamespace} --wait') OC_logout(cmd) return False, CONST.OC_PROJECT_FAIL report = cmd.run('oc get pods')