diff --git a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot index 81eea02f0..c452cff81 100644 --- a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot +++ b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot @@ -136,12 +136,6 @@ Verify RHODS Installation ... label_selector=app.kubernetes.io/name=data-science-pipelines-operator timeout=400s END - ${modelregistry} = Is Component Enabled modelregistry ${DSC_NAME} - IF "${modelregistry}" == "true" - Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE} - ... label_selector=app.kubernetes.io/part-of=model-registry-operator timeout=400s - END - ${kserve} = Is Component Enabled kserve ${DSC_NAME} IF "${kserve}" == "true" Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE} @@ -150,6 +144,18 @@ Verify RHODS Installation ... label_selector=control-plane=kserve-controller-manager timeout=400s END + ${trustyai} = Is Component Enabled trustyai ${DSC_NAME} + IF "${trustyai}" == "true" + Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE} + ... label_selector=app.kubernetes.io/part-of=trustyai timeout=400s + END + + ${modelregistry} = Is Component Enabled modelregistry ${DSC_NAME} + IF "${modelregistry}" == "true" + Wait For Deployment Replica To Be Ready namespace=${APPLICATIONS_NAMESPACE} + ... label_selector=app.kubernetes.io/part-of=model-registry-operator timeout=400s + END + IF ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${dashboard}" == "true" or "${workbenches}" == "true" or "${modelmeshserving}" == "true" or "${datasciencepipelines}" == "true" # robocop: disable Log To Console Waiting for pod status in ${APPLICATIONS_NAMESPACE} Wait For Pods Status namespace=${APPLICATIONS_NAMESPACE} timeout=200 diff --git a/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot b/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot index bf2edd984..5266615d4 100644 --- a/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot +++ b/ods_ci/tests/Tests/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot @@ -34,6 +34,8 @@ ${MODELREGISTRY_CONTROLLER_LABEL_SELECTOR} control-plane=model-registry-oper ${MODELREGISTRY_CONTROLLER_DEPLOYMENT_NAME} model-registry-operator-controller-manager ${KSERVE_CONTROLLER_MANAGER_LABEL_SELECTOR} control-plane=kserve-controller-manager ${KSERVE_CONTROLLER_MANAGER_DEPLOYMENT_NAME} kserve-controller-manager +${TRUSTYAI_CONTROLLER_MANAGER_LABEL_SELECTOR} app.kubernetes.io/part-of=trustyai +${TRUSTYAI_CONTROLLER_MANAGER_DEPLOYMENT_NAME} trustyai-service-operator-controller-manager ${IS_PRESENT} 0 ${IS_NOT_PRESENT} 1 &{SAVED_MANAGEMENT_STATES} @@ -46,6 +48,7 @@ ${IS_NOT_PRESENT} 1 ... MODELMESHERVING=${EMPTY} ... MODELREGISTRY=${EMPTY} ... KSERVE=${EMPTY} +... TRUSTYAI=${EMPTY} @{CONTROLLERS_LIST} kserve-controller-manager odh-model-controller modelmesh-controller @{REDHATIO_PATH_CHECK_EXCLUSTION_LIST} kserve-controller-manager @@ -69,7 +72,7 @@ Validate Kueue Removed State [Teardown] Restore DSC Component State kueue ${KUEUE_DEPLOYMENT_NAME} ${KUEUE_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.KUEUE} - Validate Codeflare Managed State +Validate Codeflare Managed State [Documentation] Validate that the DSC Codeflare component Managed state creates the expected resources, ... check that Codeflare deployment is created and pod is in Ready state [Tags] Operator Tier1 RHOAIENG-5435 codeflare-managed @@ -154,6 +157,23 @@ Validate Datasciencepipelines Removed State [Teardown] Restore DSC Component State datasciencepipelines ${DATASCIENCEPIPELINES_DEPLOYMENT_NAME} ${DATASCIENCEPIPELINES_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.DATASCIENCEPIPELINES} +Validate TrustyAi Managed State + [Documentation] Validate that the DSC TrustyAi component Managed state creates the expected resources, + ... check that TrustyAi deployment is created and pod is in Ready state + [Tags] Operator Tier1 RHOAIENG-14018 trustyai-managed + + Set DSC Component Managed State And Wait For Completion trustyai ${TRUSTYAI_DEPLOYMENT_NAME} ${TRUSTYAI_LABEL_SELECTOR} + + [Teardown] Restore DSC Component State trustyai ${TRUSTYAI_DEPLOYMENT_NAME} ${TRUSTYAI_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.TRUSTYAI} + +Validate TrustyAi Removed State + [Documentation] Validate that TrustyAi management state Removed does remove relevant resources. + [Tags] Operator Tier1 RHOAIENG-14018 trustyai-removed + + Set DSC Component Removed State And Wait For Completion trustyai ${TRUSTYAI_DEPLOYMENT_NAME} ${TRUSTYAI_LABEL_SELECTOR} + + [Teardown] Restore DSC Component State trustyai ${TRUSTYAI_DEPLOYMENT_NAME} ${TRUSTYAI_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.TRUSTYAI} + Validate Modelmeshserving Managed State [Documentation] Validate that the DSC Modelmeshserving component Managed state creates the expected resources, ... check that Modelmeshserving deployment is created and pods are in Ready state @@ -274,6 +294,7 @@ Suite Setup ${SAVED_MANAGEMENT_STATES.MODELMESHERVING}= Get DSC Component State ${DSC_NAME} modelmeshserving ${OPERATOR_NS} ${SAVED_MANAGEMENT_STATES.MODELREGISTRY}= Get DSC Component State ${DSC_NAME} modelregistry ${OPERATOR_NS} ${SAVED_MANAGEMENT_STATES.KSERVE}= Get DSC Component State ${DSC_NAME} kserve ${OPERATOR_NS} + ${SAVED_MANAGEMENT_STATES.TRUSTYAI}= Get DSC Component State ${DSC_NAME} trustyai ${OPERATOR_NS} Set Suite Variable ${SAVED_MANAGEMENT_STATES} Suite Teardown