From 34eb16bd5b96982a229031b09d423a96f42061ec Mon Sep 17 00:00:00 2001 From: bdattoma Date: Wed, 28 Feb 2024 13:27:34 +0100 Subject: [PATCH] add minio ns clean up kw --- ods_ci/tests/Resources/CLI/Minio.resource | 12 ++++++++++-- ...422__model_serving_llm_tgis_object_storages.robot | 4 +--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ods_ci/tests/Resources/CLI/Minio.resource b/ods_ci/tests/Resources/CLI/Minio.resource index c290a9f8f..1d1937f2d 100644 --- a/ods_ci/tests/Resources/CLI/Minio.resource +++ b/ods_ci/tests/Resources/CLI/Minio.resource @@ -59,8 +59,16 @@ Get Minio Credentials RETURN ${key} ${pw} Remove Minio - [Documentation] Delete the MinIO objects from the cluster + [Documentation] Deletes the MinIO objects from the cluster [Arguments] ${namespace} ${rc} ${out}= Run And Return Rc And Output oc delete all -l app=minio -n ${namespace} Should Be Equal As Integers ${rc} ${0} - Wait For Pods To Be Terminated label_selector=app=minio namespace=${namespace} \ No newline at end of file + +Clean Up Minio Namespace + [Documentation] Removes MinIO objects and delete the OCP namespace + [Arguments] ${namespace} + Remove Minio ${namespace} + ${rc} ${out}= Run And Return Rc And Output oc delete project ${namespace} + Should Be Equal As Integers ${rc} ${0} + ${rc} ${out}= Run And Return Rc And Output oc wait --for=delete namespace ${namespace} --timeout=20s + Should Be Equal As Integers ${rc} ${0} \ No newline at end of file diff --git a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_tgis_object_storages.robot b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_tgis_object_storages.robot index dd53b28e7..2dc6397c3 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_tgis_object_storages.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_tgis_object_storages.robot @@ -50,9 +50,7 @@ Verify User Can Serve And Query A Model From Minio [Teardown] Run Keywords ... Clean Up Test Project test_ns=${test_namespace} isvc_names=${models_names} wait_prj_deletion=${FALSE} ... AND - ... Remove Minio namespace=${minio_namespace} - ... AND - ... Run And Return Rc oc delete project ${minio_namespace} + ... Clean Up Minio Namespace namespace=${minio_namespace} *** Keywords ***