Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhancement: adding trustyai coverage for it to be GA in 2.15 #1956

Merged
merged 2 commits into from
Oct 23, 2024
Merged

enhancement: adding trustyai coverage for it to be GA in 2.15 #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6156e
enhancement: adding trustyai coverage for it to be GA in 2.15
CFSNM Oct 23, 2024
65abf0b
Merge branch 'master' into trustyai_ga
CFSNM Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we changing model registry for trustyai?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the model registry section after the trustyai one, because model registry reconciliation happens after the trustyai one, so just to follow the same order to check that the operator does

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}
Expand All @@ -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
Expand Down
23 changes: 22 additions & 1 deletion ...00__platform/0101__deploy/0104__operators/0104__rhods_operator/0113__dsc_components.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
${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
Fixed Show fixed Hide fixed
${TRUSTYAI_CONTROLLER_MANAGER_DEPLOYMENT_NAME} trustyai-service-operator-controller-manager
Fixed Show fixed Hide fixed
${IS_PRESENT} 0
${IS_NOT_PRESENT} 1
&{SAVED_MANAGEMENT_STATES}
Expand All @@ -46,6 +48,7 @@
... 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
Expand All @@ -69,7 +72,7 @@

[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
Expand Down Expand Up @@ -154,6 +157,23 @@

[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_CONTROLLER_MANAGER_DEPLOYMENT_NAME} ${TRUSTYAI_CONTROLLER_MANAGER_LABEL_SELECTOR}

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test

Line is too long (169/120)

[Teardown] Restore DSC Component State trustyai ${TRUSTYAI_CONTROLLER_MANAGER_DEPLOYMENT_NAME} ${TRUSTYAI_CONTROLLER_MANAGER_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.TRUSTYAI}

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test

Line is too long (196/120)

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_CONTROLLER_MANAGER_DEPLOYMENT_NAME} ${TRUSTYAI_CONTROLLER_MANAGER_LABEL_SELECTOR}

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test

Line is too long (169/120)

[Teardown] Restore DSC Component State trustyai ${TRUSTYAI_CONTROLLER_MANAGER_DEPLOYMENT_NAME} ${TRUSTYAI_CONTROLLER_MANAGER_LABEL_SELECTOR} ${SAVED_MANAGEMENT_STATES.TRUSTYAI}

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning test

Line is too long (196/120)

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
Expand Down Expand Up @@ -274,6 +294,7 @@
${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}

Check notice

Code scanning / Robocop

Variable '{{ name }}' is assigned but not used Note test

Variable '${SAVED_MANAGEMENT_STATES.TRUSTYAI}' is assigned but not used
Set Suite Variable ${SAVED_MANAGEMENT_STATES}

Suite Teardown
Expand Down
Loading