Move Serving and Pipelines suites out of Dashboard folder (#1553)

* move serving and pipelines out * fix imports for model serving suites * fix imports for ds pipelines
red-hat-data-services · Jun 26, 2024 · 3d280c9 · 3d280c9
1 parent 59445b9
commit 3d280c9
Show file tree

Hide file tree

Showing 34 changed files with 114 additions and 114 deletions.
diff --git a/...0__model_serving/420__model_serving.robot → ...rving/1001__model_serving_modelmesh.robot b/...0__model_serving/420__model_serving.robot → ...rving/1001__model_serving_modelmesh.robot
@@ -1,14 +1,14 @@
 *** Settings ***
 Library           OperatingSystem
-Library           ../../../../libs/Helpers.py
-Resource          ../../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../Resources/CLI/DSProjects/DSProjects.resource
-Resource          ../../../Resources/OCP.resource
-Resource          ../../../Resources/CLI/ModelServing/modelmesh.resource
+Library           ../../../libs/Helpers.py
+Resource          ../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../Resources/CLI/DSProjects/DSProjects.resource
+Resource          ../../Resources/OCP.resource
+Resource          ../../Resources/CLI/ModelServing/modelmesh.resource
 Suite Setup       Model Serving Suite Setup
 Suite Teardown    Model Serving Suite Teardown
 Test Tags         ModelMesh

diff --git a/...odel_serving/421__model_serving_gpu.robot → ...g/1002__model_serving_modelmesh_gpu.robot b/...odel_serving/421__model_serving_gpu.robot → ...g/1002__model_serving_modelmesh_gpu.robot
@@ -1,13 +1,13 @@
 *** Settings ***
 Library           OperatingSystem
-Library           ../../../../libs/Helpers.py
-Resource          ../../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../Resources/Page/ODH/Monitoring/Monitoring.resource
-Resource          ../../../Resources/CLI/ModelServing/modelmesh.resource
+Library           ../../../libs/Helpers.py
+Resource          ../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../Resources/Page/ODH/Monitoring/Monitoring.resource
+Resource          ../../Resources/CLI/ModelServing/modelmesh.resource
 Suite Setup       Model Serving Suite Setup
 Suite Teardown    Model Serving Suite Teardown
 Test Tags         ModelMesh

diff --git a/...g/423__model_serving_customruntimes.robot → .../1003__model_serving_customruntimes.robot b/...g/423__model_serving_customruntimes.robot → .../1003__model_serving_customruntimes.robot
@@ -1,9 +1,9 @@
 *** Settings ***
 Documentation     Collection of tests to validate the model serving stack for Large Language Models (LLM)
-Resource           ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDashboardSettingsRuntimes.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDashboardSettingsRuntimes.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
 Suite Setup       Custom Serving Runtime Suite Setup
 Suite Teardown    Custom Serving Runtime Suite Teardown
 Test Tags         Dashboard

diff --git a/...ing/424__model_serving_bias_metrics.robot → ...ng/1004__model_serving_bias_metrics.robot b/...ing/424__model_serving_bias_metrics.robot → ...ng/1004__model_serving_bias_metrics.robot
@@ -1,14 +1,14 @@
 *** Settings ***
 Documentation       TestSuite testing Bias metrics for Deployed Models
-Resource            ../../../Resources/RHOSi.resource
-Resource            ../../../Resources/OCP.resource
-Resource            ../../../Resources/Common.robot
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource            ../../../Resources/Page/Operators/ISVs.resource
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource            ../../../Resources/Page/OCPDashboard/Monitoring/Metrics.robot
+Resource            ../../Resources/RHOSi.resource
+Resource            ../../Resources/OCP.resource
+Resource            ../../Resources/Common.robot
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource            ../../Resources/Page/Operators/ISVs.resource
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource            ../../Resources/Page/OCPDashboard/Monitoring/Metrics.robot
 Library             OpenShiftLibrary
 Suite Setup         Bias Metrics Suite Setup
 Suite Teardown      Bias Metrics Suite Teardown

diff --git a/.../424__model_serving_cluster_setting.robot → ...1005__model_serving_cluster_setting.robot b/.../424__model_serving_cluster_setting.robot → ...1005__model_serving_cluster_setting.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation    Test cases that verify High Availability for ModelServing CLuster Setting
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDashboard.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDashboard.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
 Suite Setup      Model Serving Cluster Setting Suite Setup
 Suite Teardown   Model Serving Cluster Setting Suite Teardown
 Test Setup       Model Serving Cluster Setting Test Setup

diff --git a/...g/425__model_serving_ovms_on_kserve.robot → .../1006__model_serving_ovms_on_kserve.robot b/...g/425__model_serving_ovms_on_kserve.robot → .../1006__model_serving_ovms_on_kserve.robot
@@ -1,15 +1,15 @@
 *** Settings ***
 Documentation     Suite of test cases for OVMS in Kserve
 Library           OperatingSystem
-Library           ../../../../libs/Helpers.py
-Resource          ../../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../Resources/Page/ODH/Monitoring/Monitoring.resource
-Resource          ../../../Resources/OCP.resource
-Resource          ../../../Resources/CLI/ModelServing/modelmesh.resource
+Library           ../../../libs/Helpers.py
+Resource          ../../Resources/Page/ODH/JupyterHub/HighAvailability.robot
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../Resources/Page/ODH/Monitoring/Monitoring.resource
+Resource          ../../Resources/OCP.resource
+Resource          ../../Resources/CLI/ModelServing/modelmesh.resource
 Suite Setup       OVMS On Kserve Suite Setup
 Suite Teardown    OVMS On Kserve Suite Teardown
 Test Tags         Kserve

diff --git a/...422__model_serving_caikit_py_client.robot → ...007__model_serving_caikit_py_client.robot b/...422__model_serving_caikit_py_client.robot → ...007__model_serving_caikit_py_client.robot
@@ -2,7 +2,7 @@
 Documentation    Test suite to validate caikit-nlp-client library usage with Kserve models.
 ...              These tests leverage on Caikit+TGIS combined Serving Runtime
 ...              PythonLibrary repo: https://github.com/opendatahub-io/caikit-nlp-client
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
 Suite Setup    Caikit Client Suite Setup
 Suite Teardown    Caikit Client Suite Teardown
 Test Teardown    SeleniumLibrary.Close All Browsers

diff --git a/...serving/LLMs/422__model_serving_llm.robot → ...serving_llm/1007__model_serving_llm.robot b/...serving/LLMs/422__model_serving_llm.robot → ...serving_llm/1007__model_serving_llm.robot
@@ -1,10 +1,10 @@
 *** Settings ***
 Documentation     Collection of CLI tests to validate the model serving stack for Large Language Models (LLM).
 ...               These tests leverage on Caikit+TGIS combined Serving Runtime
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../../Resources/OCP.resource
-Resource          ../../../../Resources/Page/Operators/ISVs.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../../Resources/OCP.resource
+Resource          ../../../Resources/Page/Operators/ISVs.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
 Library            OpenShiftLibrary
 Suite Setup       Install Model Serving Stack Dependencies
 Suite Teardown    RHOSi Teardown

diff --git a/...ving/LLMs/422__model_serving_llm_UI.robot → ...ving_llm/1007__model_serving_llm_UI.robot b/...ving/LLMs/422__model_serving_llm_UI.robot → ...ving_llm/1007__model_serving_llm_UI.robot
@@ -1,14 +1,14 @@
 *** Settings ***
 Documentation     Collection of UI tests to validate the model serving stack for Large Language Models (LLM).
 ...               These tests leverage on Caikit+TGIS combined Serving Runtime
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../../Resources/OCP.resource
-Resource          ../../../../Resources/Page/Operators/ISVs.resource
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDashboardAPI.resource
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../../Resources/OCP.resource
+Resource          ../../../Resources/Page/Operators/ISVs.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDashboardAPI.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource
 Library            OpenShiftLibrary
 Suite Setup       Setup Kserve UI Test
 Suite Teardown    RHOSi Teardown

diff --git a/.../LLMs/422__model_serving_llm_models.robot → ..._llm/1007__model_serving_llm_models.robot b/.../LLMs/422__model_serving_llm_models.robot → ..._llm/1007__model_serving_llm_models.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation     Collection of CLI tests to validate the model serving stack for different Large Language Models (LLM).
 ...               These tests leverage on TGIS Standalone Serving Runtime
-Resource          ../../../../Resources/OCP.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/OCP.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
 Library            OpenShiftLibrary
 Suite Setup       Suite Setup
 Suite Teardown    Suite Teardown

diff --git a/...model_serving_llm_other_runtimes_UI.robot → ...model_serving_llm_other_runtimes_UI.robot b/...model_serving_llm_other_runtimes_UI.robot → ...model_serving_llm_other_runtimes_UI.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation     Collection of UI tests to validate the model serving stack for Large Language Models (LLM)
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
 Suite Setup       Non-Admin Setup Kserve UI Test
 Suite Teardown    Non-Admin Teardown Kserve UI Test
 Test Tags         KServe

diff --git a/...ng/LLMs/422__model_serving_llm_tgis.robot → ...ng_llm/1007__model_serving_llm_tgis.robot b/...ng/LLMs/422__model_serving_llm_tgis.robot → ...ng_llm/1007__model_serving_llm_tgis.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation     Collection of CLI tests to validate the model serving stack for Large Language Models (LLM).
 ...               These tests leverage on TGIS Standalone Serving Runtime
-Resource          ../../../../Resources/OCP.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/OCP.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
 Library            OpenShiftLibrary
 Suite Setup       Suite Setup
 Suite Teardown    RHOSi Teardown

diff --git a/...el_serving_llm_tgis_object_storages.robot → ...el_serving_llm_tgis_object_storages.robot b/...el_serving_llm_tgis_object_storages.robot → ...el_serving_llm_tgis_object_storages.robot
@@ -2,9 +2,9 @@
 Documentation     Collection of CLI tests to validate fetching models from different object storages
 ...               in the scope of model serving stack for Large Language Models (LLM).
 ...               These tests leverage on TGIS Standalone Serving Runtime
-Resource          ../../../../Resources/OCP.resource
-Resource          ../../../../Resources/CLI/ModelServing/llm.resource
-Resource          ../../../../Resources/CLI/Minio.resource
+Resource          ../../../Resources/OCP.resource
+Resource          ../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../Resources/CLI/Minio.resource
 Library           OpenShiftLibrary
 Suite Setup       Suite Setup
 Suite Teardown    RHOSi Teardown

diff --git a/...llm/426__model_serving_vllm_metrics.robot → ...lm/1008__model_serving_vllm_metrics.robot b/...llm/426__model_serving_vllm_metrics.robot → ...lm/1008__model_serving_vllm_metrics.robot
@@ -1,13 +1,13 @@
 *** Settings ***
 Documentation     Basic vLLM deploy test to validate metrics being correctly exposed in OpenShift
-Resource          ../../../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
-Resource          ../../../../../Resources/OCP.resource
-Resource          ../../../../../Resources/Page/Operators/ISVs.resource
-Resource          ../../../../../Resources/Page/ODH/ODHDashboard/ODHDashboardAPI.resource
-Resource          ../../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
-Resource          ../../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource          ../../../../../Resources/CLI/ModelServing/llm.resource
-Resource          ../../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource
+Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
+Resource          ../../../../Resources/OCP.resource
+Resource          ../../../../Resources/Page/Operators/ISVs.resource
+Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDashboardAPI.resource
+Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource
+Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource          ../../../../Resources/CLI/ModelServing/llm.resource
+Resource          ../../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Permissions.resource
 Library           OpenShiftLibrary
 Suite Setup       Suite Setup
 Suite Teardown    Suite Teardown

diff --git a/...nes/431__data-science-pipelines-api.robot → ...es/1100__data-science-pipelines-api.robot b/...nes/431__data-science-pipelines-api.robot → ...es/1100__data-science-pipelines-api.robot
@@ -1,13 +1,13 @@
 *** Settings ***
 Documentation       Test suite for OpenShift Pipeline API
-Resource            ../../../Resources/RHOSi.resource
-Resource            ../../../Resources/ODS.robot
-Resource            ../../../Resources/Common.robot
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHDashboard.robot
-Resource            ../../../Resources/Page/ODH/ODHDashboard/ODHDataSciencePipelines.resource
+Resource            ../../Resources/RHOSi.resource
+Resource            ../../Resources/ODS.robot
+Resource            ../../Resources/Common.robot
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHDashboard.robot
+Resource            ../../Resources/Page/ODH/ODHDashboard/ODHDataSciencePipelines.resource
 Library             DateTime
-Library             ../../../../libs/DataSciencePipelinesAPI.py
-Library             ../../../../libs/DataSciencePipelinesKfp.py
+Library             ../../../libs/DataSciencePipelinesAPI.py
+Library             ../../../libs/DataSciencePipelinesKfp.py
 Test Tags           DataSciencePipelines
 Suite Setup         Data Science Pipelines Suite Setup
 Suite Teardown      RHOSi Teardown

diff --git a/...s/435__data-science-pipelines-elyra.robot → .../1100__data-science-pipelines-elyra.robot b/...s/435__data-science-pipelines-elyra.robot → .../1100__data-science-pipelines-elyra.robot
@@ -1,17 +1,17 @@
 *** Settings ***
 Documentation    Test Suite for Elyra pipelines in workbenches
-Resource         ../../../Resources/ODS.robot
-Resource         ../../../Resources/Common.robot
-Resource         ../../../Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
-Resource         ../../../Resources/Page/ODH/JupyterHub/JupyterLabLauncher.robot
-Resource         ../../../Resources/Page/ODH/JupyterHub/Elyra.resource
-Resource         ../../../Resources/Page/OCPDashboard/Builds/Builds.robot
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Storages.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Pipelines.resource
-Resource         ../../../Resources/Page/ODH/ODHDashboard/ODHDataSciencePipelines.resource
+Resource         ../../Resources/ODS.robot
+Resource         ../../Resources/Common.robot
+Resource         ../../Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
+Resource         ../../Resources/Page/ODH/JupyterHub/JupyterLabLauncher.robot
+Resource         ../../Resources/Page/ODH/JupyterHub/Elyra.resource
+Resource         ../../Resources/Page/OCPDashboard/Builds/Builds.robot
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Workbenches.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Storages.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Pipelines.resource
+Resource         ../../Resources/Page/ODH/ODHDashboard/ODHDataSciencePipelines.resource
 Library          Screenshot
 Library          String
 Library          DebugLibrary