From c1f5fb5270e1b84482627ce4ff854e53a9568b8e Mon Sep 17 00:00:00 2001 From: bdattoma Date: Tue, 23 Jan 2024 18:08:49 +0100 Subject: [PATCH] add common kw to set thanos suite variables --- .../Resources/Page/ODH/Monitoring/Monitoring.resource | 7 +++++++ ods_ci/tests/Resources/RHOSi.resource | 1 + .../LLMs/422__model_serving_llm_other_runtimes_UI.robot | 5 +---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ods_ci/tests/Resources/Page/ODH/Monitoring/Monitoring.resource b/ods_ci/tests/Resources/Page/ODH/Monitoring/Monitoring.resource index e456bea60..fded9627e 100644 --- a/ods_ci/tests/Resources/Page/ODH/Monitoring/Monitoring.resource +++ b/ods_ci/tests/Resources/Page/ODH/Monitoring/Monitoring.resource @@ -160,3 +160,10 @@ Get Thanos Metrics List END ${rc} ${out}= Run And Return Rc And Output ${cmd} | tr -d '"' RETURN ${out} + + +Set Thanos Credentials Variables + ${thanos_url}= Get OpenShift Thanos URL + ${token}= Generate Thanos Token + Set Suite Variable ${THANOS_URL} ${thanos_url} + Set Suite Variable ${THANOS_TOKEN} ${token} \ No newline at end of file diff --git a/ods_ci/tests/Resources/RHOSi.resource b/ods_ci/tests/Resources/RHOSi.resource index 9e9774135..c4770d84c 100644 --- a/ods_ci/tests/Resources/RHOSi.resource +++ b/ods_ci/tests/Resources/RHOSi.resource @@ -43,6 +43,7 @@ Resource Common.robot ... Create Secret For S3-Like Buckets ... Login To OCP Using API ... Generate Thanos Token +... Set Thanos Credentials Variables *** Keywords *** diff --git a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot index 518705dbc..649e52c31 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot @@ -87,10 +87,7 @@ Non-Admin Setup Kserve UI Test ${PROJECTS_TO_DELETE}= Create List ${TEST_NS} Set Suite Variable ${PROJECTS_TO_DELETE} Fetch CA Certificate If RHODS Is Self-Managed - ${thanos_url}= Get OpenShift Thanos URL - ${token}= Generate Thanos Token - Set Suite Variable ${THANOS_URL} ${thanos_url} - Set Suite Variable ${THANOS_TOKEN} ${token} + Set Thanos Credentials Variables Non-Admin Teardown Kserve UI Test Delete Data Science Project project_title=${TEST_NS}