add minio ns clean up kw

red-hat-data-services · Feb 28, 2024 · 34eb16b · 34eb16b
1 parent 285f66f
commit 34eb16b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git 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}
+
+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}
diff --git a/...__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_tgis_object_storages.robot b/...__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 ***