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

Add support to create DSC without any conditon for rhods24 #996

Merged
merged 5 commits into from
Nov 2, 2023
Merged

Add support to create DSC without any conditon for rhods24 #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90dce35
Add fix for rhods 2.4
tarukumar Oct 30, 2023
b701dd9
Add trusty ai to dsc
tarukumar Oct 31, 2023
22d3164
Add trusty ai
tarukumar Nov 2, 2023
7b4f5c4
Add fix for model serving
tarukumar Nov 2, 2023
b37176e
Merge branch 'master' into new-fix-rhods24
tarukumar Nov 2, 2023
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
2 changes: 2 additions & 0 deletions ods_ci/tasks/Resources/Files/dsc_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ spec:
managementState: <modelmeshserving_value>
ray:
managementState: <ray_value>
trustyai:
managementState: <trustyai_value>
workbenches:
managementState: <workbenches_value>

7 changes: 2 additions & 5 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 @@ -6,7 +6,7 @@ Library OperatingSystem

*** Variables ***
${DSC_NAME} = default
@{COMPONENT_LIST} = dashboard datasciencepipelines kserve modelmeshserving workbenches codeflare ray # robocop: disable
@{COMPONENT_LIST} = dashboard datasciencepipelines kserve modelmeshserving workbenches codeflare ray trustyai # robocop: disable


*** Keywords ***
Expand Down Expand Up @@ -54,10 +54,7 @@ Verify RHODS Installation
${is_codeflare_managed} = Is CodeFlare Managed
Log Will verify CodeFlare operator: ${is_codeflare_managed} console=yes
IF ${is_codeflare_managed} CodeFlare Operator Should Be Installed

IF "${UPDATE_CHANNEL}" != "stable" and "${UPDATE_CHANNEL}" != "beta"
Apply DataScienceCluster CustomResource dsc_name=${DSC_NAME}
END
Apply DataScienceCluster CustomResource dsc_name=${DSC_NAME}
${dashboard} = Is Component Enabled dashboard ${DSC_NAME}
IF ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${dashboard}" == "true"
# Needs to be removed ASAP
Expand Down
1 change: 1 addition & 0 deletions ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/420__model_serving.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Verify Openvino_IR Model Via UI
... ODS-2054
Open Model Serving Home Page
Try Opening Create Server
Open Data Science Projects Home Page
Wait for RHODS Dashboard to Load wait_for_cards=${FALSE} expected_page=Data science projects
Create Data Science Project title=${PRJ_TITLE} description=${PRJ_DESCRIPTION}
Create S3 Data Connection project_title=${PRJ_TITLE} dc_name=model-serving-connection
Expand Down