Skip to content

Commit

Permalink
Merge branch 'red-hat-data-services:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tarukumar authored Dec 14, 2023
2 parents 5037e7d + ac355c4 commit 51b27ad
Show file tree
Hide file tree
Showing 19 changed files with 196 additions and 44 deletions.
6 changes: 6 additions & 0 deletions ods_ci/libs/DataSciencePipelinesAPI.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ def get_default_storage(self):
break
return storage_class['metadata']['name']

def get_openshift_server(self):
return self.run_oc('oc whoami --show-server=true')[0].replace('\n', '')

def get_openshift_token(self):
return self.run_oc('oc whoami --show-token=true')[0].replace('\n', '')

def run_oc(self, command):
process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
output, error = process.communicate()
Expand Down
4 changes: 3 additions & 1 deletion ods_ci/libs/DataSciencePipelinesKfpTekton.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ def kfp_tekton_create_run_from_pipeline_func(
result = client.create_run_from_pipeline_func(
pipeline_func=pipeline, arguments={
'mlpipeline_minio_artifact_secret': mlpipeline_minio_artifact_secret["data"],
'bucket_name': bucket_name
'bucket_name': bucket_name,
'openshift_server': self.api.get_openshift_server(),
'openshift_token': self.api.get_openshift_token()
}
)
# easy to debug and double check failures
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ Install Kserve Dependencies
... catalog_source_name=redhat-operators
... operator_group_name=serverless-operators
... operator_group_ns=${SERVERLESS_NS}
... operator_group_target_ns=${NONE}}
... operator_group_target_ns=${NONE}
Wait For Pods To Be Ready label_selector=name=knative-openshift
... namespace=${SERVERLESS_NS}
Wait For Pods To Be Ready label_selector=name=knative-openshift-ingress
Expand Down
4 changes: 2 additions & 2 deletions ods_ci/tests/Resources/Files/AppsInfoDictionary_latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"matching": "full"
},
"1": {
"text": "Adding users for OpenShift Data Science",
"text": "Adding users for Red Hat OpenShift AI",
"url": "https://access.redhat.com/documentation/en-us/red_hat_openshift_data_science/1/html/managing_users_and_user_resources/adding-users-for-openshift-data-science_useradd",
"matching": "full"
}
Expand Down Expand Up @@ -275,7 +275,7 @@
],
"provider": "by Starburst",
"title": "Starburst Enterprise",
"description": "Starburst Enterprise platform (SEP) is the commericial distribution of Trino, which is an open-source, Massively Parallel Processing (MPP) ANSI SQL query engine. Starburst simplifies data access for your RHODS workloads by providing fast access to all of your data, no matter where it lives. Starburst does this by connecting directly to each data source and pulling the data back into memory for processing, alleviating the need to copy or move the data into a single location first.",
"description": "Starburst Enterprise platform (SEP) is the commericial distribution of Trino, which is an open-source, Massively Parallel Processing (MPP) ANSI SQL query engine. Starburst simplifies data access for your Red Hat OpenShift AI workloads by providing fast access to all of your data, no matter where it lives. Starburst does this by connecting directly to each data source and pulling the data back into memory for processing, alleviating the need to copy or move the data into a single location first.",
"rhods_type": ["Self-managed"],
"image": "data:image/svg+xml;base64,<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 577.33 159.1"><defs><style>.cls-1{fill:#253746;}.cls-2{fill:#00a7b5;}</style></defs><title>Starburst_Logo_NoTag_RGB</title><path class="cls-1" d="M224.73,81.31a26,26,0,0,0-6.49-3.52c-2.41-.9-4.79-1.73-7.17-2.51q-2.88-1-5.52-1.92a18.92,18.92,0,0,1-4.71-2.46,11.92,11.92,0,0,1-3.32-3.62,10.51,10.51,0,0,1-1.25-5.39,11.86,11.86,0,0,1,1.3-5.69,12.08,12.08,0,0,1,3.43-4,14.63,14.63,0,0,1,4.72-2.36,17.76,17.76,0,0,1,5.11-.77,17.45,17.45,0,0,1,8.39,1.87,16.74,16.74,0,0,1,5.68,5l5.5-4.43A20.37,20.37,0,0,0,223,45.64a26.36,26.36,0,0,0-11.85-2.46,28.92,28.92,0,0,0-7.62,1.06,21.73,21.73,0,0,0-7,3.38,17.73,17.73,0,0,0-5.15,5.88,17.23,17.23,0,0,0-2,8.48,17.33,17.33,0,0,0,1.59,7.81,16.43,16.43,0,0,0,4.2,5.35A22.24,22.24,0,0,0,201,78.66q3.27,1.35,6.65,2.41c2.18.71,4.27,1.41,6.26,2.12a22.91,22.91,0,0,1,5.31,2.65,12.59,12.59,0,0,1,3.71,4,12.94,12.94,0,0,1,0,11.67,14,14,0,0,1-3.57,4.14,14.93,14.93,0,0,1-4.87,2.51,18.37,18.37,0,0,1-5.3.82,17.59,17.59,0,0,1-9.4-2.46,18.32,18.32,0,0,1-6.22-6.12l-6,4.43a23.18,23.18,0,0,0,4.24,4.44,24.4,24.4,0,0,0,5.21,3.18,28.32,28.32,0,0,0,5.87,1.88,30.82,30.82,0,0,0,6.17.62,28.9,28.9,0,0,0,8-1.15,20.87,20.87,0,0,0,7.11-3.57,18.43,18.43,0,0,0,5.07-6.12,18.82,18.82,0,0,0,2-8.82,17.38,17.38,0,0,0-1.83-8.44,17.19,17.19,0,0,0-4.71-5.49"/><path class="cls-1" d="M252.24,55.33h-6.56V68.06h-9.35v5.49h9.35V101.7a14.13,14.13,0,0,0,1.11,6.07,10.06,10.06,0,0,0,2.85,3.67,9.64,9.64,0,0,0,3.75,1.83,16.77,16.77,0,0,0,3.86.48,23.78,23.78,0,0,0,4.1-.34,19.88,19.88,0,0,0,3.61-1l-.29-5.69a14,14,0,0,1-2.84,1.06,11.26,11.26,0,0,1-2.84.39,10.21,10.21,0,0,1-2.71-.34,4.72,4.72,0,0,1-2.16-1.25,5.86,5.86,0,0,1-1.4-2.56,15,15,0,0,1-.48-4.14V73.55H265V68.06H252.24Z"/><path class="cls-1" d="M305.54,94a16.87,16.87,0,0,1-1,5.69,14.64,14.64,0,0,1-2.8,4.77,13,13,0,0,1-4.53,3.27,14.87,14.87,0,0,1-6.17,1.21,16.79,16.79,0,0,1-3.8-.44,10.36,10.36,0,0,1-3.43-1.44,7.72,7.72,0,0,1-2.46-2.65,8.2,8.2,0,0,1-.91-4.05,6.59,6.59,0,0,1,2.12-5.11,14.14,14.14,0,0,1,5.45-2.94A35.54,35.54,0,0,1,295.47,91c2.73-.22,5.45-.34,8.14-.34h1.93Zm6.17,9.06V83.29a17.87,17.87,0,0,0-1.35-7.23A13.78,13.78,0,0,0,306.61,71a16.42,16.42,0,0,0-5.6-3,22.27,22.27,0,0,0-6.84-1,27.69,27.69,0,0,0-10.36,1.83,21.54,21.54,0,0,0-7.38,4.63l3.66,4.34A17.88,17.88,0,0,1,286,73.84a19.37,19.37,0,0,1,7.51-1.45c3.93,0,6.91,1,9,2.87s3.08,4.82,3.08,8.71v1.44q-6.17,0-11.9.43a41.48,41.48,0,0,0-10.17,1.94,15.91,15.91,0,0,0-7.09,4.54c-1.77,2-2.65,4.79-2.65,8.27a12.67,12.67,0,0,0,1.5,6.39,13.24,13.24,0,0,0,3.76,4.25,14.81,14.81,0,0,0,5,2.37,21,21,0,0,0,5.35.73,20.61,20.61,0,0,0,9.4-2,19.1,19.1,0,0,0,7-6.51h.19a37.28,37.28,0,0,0,.19,3.76c.13,1.29.29,2.48.49,3.57h5.87a35.85,35.85,0,0,1-.57-4.73c-.14-1.86-.2-3.66-.2-5.39"/><path class="cls-1" d="M345.34,66.9a16,16,0,0,0-14.47,8.87h-.19c0-1,0-2.19-.1-3.67s-.16-2.82-.28-4H324c.13,1.54.22,3.27.29,5.2s.09,3.51.09,4.73v35.18H331V90.09a23.89,23.89,0,0,1,1.11-7.74A15.94,15.94,0,0,1,335,77.06a10.77,10.77,0,0,1,4.19-3,13.46,13.46,0,0,1,5-1,18.86,18.86,0,0,1,2.7.19,13.8,13.8,0,0,1,1.92.38l.87-6.26A11.9,11.9,0,0,0,347.6,67a22.24,22.24,0,0,0-2.26-.1"/><path class="cls-1" d="M398.91,97.7a17,17,0,0,1-3.33,5.78,15,15,0,0,1-5.35,3.86,17.83,17.83,0,0,1-7.23,1.4,17.14,17.14,0,0,1-6.94-1.4,16.9,16.9,0,0,1-5.49-3.81A17.37,17.37,0,0,1,367,97.79a20.48,20.48,0,0,1,0-14.36,17.87,17.87,0,0,1,3.62-5.78,16.59,16.59,0,0,1,5.49-3.86,17.14,17.14,0,0,1,6.94-1.4,17.35,17.35,0,0,1,7.23,1.45,15.36,15.36,0,0,1,5.35,3.91,16.94,16.94,0,0,1,3.33,5.78,22.22,22.22,0,0,1,0,14.17m1.69-24a21.91,21.91,0,0,0-7.33-5,24.22,24.22,0,0,0-9.59-1.83,21.44,21.44,0,0,0-9.54,2.27,18.56,18.56,0,0,0-7.52,6.69h-.2V40.29h-6.55v72.88h6.55v-7.62h.2a18.46,18.46,0,0,0,7.52,6.56,21.79,21.79,0,0,0,9.54,2.22,24.4,24.4,0,0,0,9.59-1.83,22.09,22.09,0,0,0,7.33-5,22.8,22.8,0,0,0,4.72-7.52,26.71,26.71,0,0,0,0-18.7,22.8,22.8,0,0,0-4.72-7.52"/><path class="cls-1" d="M454,103.24V68.06h-6.55V91.19a24,24,0,0,1-1.16,7.86,16.1,16.1,0,0,1-3.08,5.49,12.35,12.35,0,0,1-4.39,3.23,12.62,12.62,0,0,1-5.06,1.06,13.45,13.45,0,0,1-5.93-1.15,9.48,9.48,0,0,1-3.76-3.23,13.64,13.64,0,0,1-2-5,33.46,33.46,0,0,1-.57-6.46v-25h-6.56V95.72q0,8.39,4.29,13.5t12.87,5.11a18.3,18.3,0,0,0,9.16-2.46,14.84,14.84,0,0,0,6.26-6.41h.2q0,1.44.09,3.66c.07,1.48.16,2.83.29,4h6.27c-.13-1.54-.23-3.28-.29-5.2s-.1-3.51-.1-4.73"/><path class="cls-1" d="M486.47,66.9a15.78,15.78,0,0,0-8.68,2.46A15.56,15.56,0,0,0,472,75.77h-.19c0-1,0-2.19-.1-3.67s-.16-2.82-.29-4h-6.26c.12,1.54.22,3.27.28,5.2s.1,3.51.1,4.73v35.18h6.55V90.09a23.89,23.89,0,0,1,1.11-7.74,16,16,0,0,1,2.9-5.29,10.62,10.62,0,0,1,4.19-3,13.44,13.44,0,0,1,5-1,18.86,18.86,0,0,1,2.7.19,14,14,0,0,1,1.93.38l.87-6.26a12.18,12.18,0,0,0-2.08-.38,22.11,22.11,0,0,0-2.26-.1"/><path class="cls-1" d="M513.46,87.14a25,25,0,0,1-8.19-2.84,5.46,5.46,0,0,1-2.6-4.87,6,6,0,0,1,.82-3.18A6.67,6.67,0,0,1,505.66,74a9.32,9.32,0,0,1,3.08-1.25,15.78,15.78,0,0,1,3.47-.39,12.67,12.67,0,0,1,6.7,1.79,11.44,11.44,0,0,1,4.38,4.58l5-3.76a14.78,14.78,0,0,0-6.65-6,21.07,21.07,0,0,0-9.16-2.12,23.29,23.29,0,0,0-6,.77A16.18,16.18,0,0,0,501.37,70a11.75,11.75,0,0,0-3.62,4A12.17,12.17,0,0,0,496.4,80a10.32,10.32,0,0,0,1.25,5.3,11.57,11.57,0,0,0,3.18,3.52A14.77,14.77,0,0,0,505,91c1.52.48,3,.88,4.29,1.21a44.29,44.29,0,0,1,9.89,3.32,5.72,5.72,0,0,1,3.42,5.35,7.25,7.25,0,0,1-.87,3.71,7.35,7.35,0,0,1-2.31,2.46,9.37,9.37,0,0,1-3.38,1.35,20.29,20.29,0,0,1-4,.38,14.76,14.76,0,0,1-12.54-7l-5.2,3.85a18.36,18.36,0,0,0,7.9,6.66,24.49,24.49,0,0,0,9.93,2.12,26.4,26.4,0,0,0,6.12-.73,15.63,15.63,0,0,0,5.45-2.41,12.9,12.9,0,0,0,3.9-4.33,13.06,13.06,0,0,0,1.5-6.51,10.37,10.37,0,0,0-3.81-8.44q-3.81-3.12-11.81-4.77"/><path class="cls-1" d="M564,73.55V68.06H551.31V55.33h-6.56V68.06H535.4v5.49h9.35V101.7a14.13,14.13,0,0,0,1.11,6.07,9.69,9.69,0,0,0,6.6,5.5,16.7,16.7,0,0,0,3.86.48,22.71,22.71,0,0,0,4.09-.34,19,19,0,0,0,3.62-1l-.29-5.69a14,14,0,0,1-2.84,1.06,11.33,11.33,0,0,1-2.85.39,10.19,10.19,0,0,1-2.7-.34,4.84,4.84,0,0,1-2.17-1.25,5.91,5.91,0,0,1-1.39-2.56,14.61,14.61,0,0,1-.48-4.14V73.55Z"/><path class="cls-2" d="M106.26,73.42,83.82,9h-.08a70.49,70.49,0,0,0-10.12.81l31.06,64.25a16.83,16.83,0,0,1,1.58-.64"/><path class="cls-2" d="M101.28,76.34,49.3,18a70.94,70.94,0,0,0-9.15,6.14l59.93,53.4a15.23,15.23,0,0,1,1.2-1.21"/><path class="cls-2" d="M97.8,81,22.53,44.57a69.43,69.43,0,0,0-4.81,10.29L97.16,82.52A12.6,12.6,0,0,1,97.8,81"/><path class="cls-2" d="M96.27,87.39c0-.29.07-.56.09-.85L13.3,81.76A71.21,71.21,0,0,0,14.5,93l81.86-4.72c0-.29-.09-.56-.09-.85"/><path class="cls-2" d="M97.16,92.26,24.39,117.6a71.5,71.5,0,0,0,6.5,8.57L97.8,93.83a12.6,12.6,0,0,1-.64-1.57"/><path class="cls-2" d="M100.08,97.23,50.24,141.65a70.35,70.35,0,0,0,9,4l42.05-47.2a15.23,15.23,0,0,1-1.2-1.21"/><path class="cls-2" d="M104.68,100.72,80.88,150c1,0,1.9.14,2.86.14,1.91,0,3.78-.14,5.64-.28l16.88-48.46a14.5,14.5,0,0,1-1.58-.64"/><path class="cls-1" d="M111.13,102.24c-.3,0-.57-.07-.86-.08l-2.51,43.66a70.62,70.62,0,0,0,6.57-2.77L112,102.16c-.29,0-.56.08-.85.08"/><path class="cls-1" d="M121,98.44l19.92,22.36c1-1.4,2-2.84,2.88-4.32l-21.6-19.25a15.23,15.23,0,0,1-1.2,1.21"/><path class="cls-1" d="M125.89,86.54c0,.29.09.56.09.85s-.07.57-.09.85l27.57,1.59c.24-1.62.44-3.25.56-4.91Z"/><path class="cls-1" d="M122.17,77.55l27.07-24.12q-1.2-3-2.66-5.83L121,76.34a15.23,15.23,0,0,1,1.2,1.21"/><path class="cls-1" d="M110.27,72.62c.29,0,.56-.08.86-.08s.56.07.85.08l3.23-56.15a71.85,71.85,0,0,0-8.37-3.53Z"/><path class="cls-1" d="M116,101.36l11.63,33.38c1.56-1.24,3-2.56,4.49-3.92l-14.54-30.1a14.5,14.5,0,0,1-1.58.64"/><path class="cls-1" d="M124.45,93.83l24.75,12c.6-1.5,1.17-3,1.66-4.56l-25.77-9a12.6,12.6,0,0,1-.64,1.57"/><path class="cls-1" d="M125.09,82.53l28.85-10c-.18-1.83-.49-3.61-.81-5.39L124.45,81a12.74,12.74,0,0,1,.64,1.58"/><path class="cls-1" d="M137.15,33.54A69.65,69.65,0,0,0,131.81,28L116,73.42a16.83,16.83,0,0,1,1.58.64Z"/></svg>",
"sidebar_h1": "Starburst Enterprise",
Expand Down
88 changes: 88 additions & 0 deletions ods_ci/tests/Resources/Files/pipeline-samples/ray_integration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
from kfp import components, dsl
from ods_ci.libs.DataSciencePipelinesKfpTekton import DataSciencePipelinesKfpTekton


def ray_fn(openshift_server:str, openshift_token:str) -> int:
from codeflare_sdk.cluster.cluster import Cluster, ClusterConfiguration
from codeflare_sdk.cluster.auth import TokenAuthentication
import ray

print('before login')
auth = TokenAuthentication(
token=openshift_token,
server=openshift_server,
skip_tls=True
)
auth_return = auth.login()
print(f'auth_return: "{auth_return}"')
print('after login')
cluster = Cluster(ClusterConfiguration(
name='raytest',
# namespace must exist, and it is the same from 432__data-science-pipelines-tekton.robot
namespace='pipelineskfptekton1',
num_workers=1,
head_cpus='500m',
min_memory=1,
max_memory=1,
num_gpus=0,
image="quay.io/project-codeflare/ray:latest-py39-cu118",
instascale=False
))
# workaround for https://github.com/project-codeflare/codeflare-sdk/pull/412
cluster_file_name = '/opt/app-root/src/.codeflare/appwrapper/raytest.yaml'
# Read in the file
with open(cluster_file_name, 'r') as file:
filedata = file.read()

# Replace the target string
filedata = filedata.replace('busybox:1.28', 'quay.io/project-codeflare/busybox:latest')

# Write the file out again
with open(cluster_file_name, 'w') as file:
file.write(filedata)
# end workaround

# always clean the resources
cluster.down()
print(cluster.status())
cluster.up()
cluster.wait_ready()
print(cluster.status())
print(cluster.details())

ray_dashboard_uri = cluster.cluster_dashboard_uri()
ray_cluster_uri = cluster.cluster_uri()
print(ray_dashboard_uri)
print(ray_cluster_uri)

# before proceeding make sure the cluster exists and the uri is not empty
assert ray_cluster_uri, "Ray cluster needs to be started and set before proceeding"

# reset the ray context in case there's already one.
ray.shutdown()
# establish connection to ray cluster
ray.init(address=ray_cluster_uri)
print("Ray cluster is up and running: ", ray.is_initialized())

@ray.remote
def train_fn():
return 100

result = ray.get(train_fn.remote())
assert 100 == result
ray.shutdown()
cluster.down()
auth.logout()
return result


@dsl.pipeline(
name="Ray Integration Test",
description="Ray Integration Test",
)
def ray_integration(openshift_server, openshift_token):
ray_op = components.create_component_from_func(
ray_fn, base_image=DataSciencePipelinesKfpTekton.base_image,
packages_to_install=['codeflare-sdk']
)
ray_op(openshift_server, openshift_token)
8 changes: 6 additions & 2 deletions ods_ci/tests/Resources/OCP.resource
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ Get Pod Hardware Resources And Limits
RETURN ${resources}

Container Hardware Resources Should Match Expected
[Documentation] This keyword checks that the requests/limits set in a specific container in a pod contain the
... requests and limits passed in with `exp_requests` and `exp_limits`. This means that the container might have
... additional requests/limits set which are not explicitly checked against. If you want to make sure you're
... checking all attributes you have to explicitly pass them in with `exp_requests/limits`.
[Arguments] ${container_name} ${pod_label_selector} ${namespace}
... ${exp_requests}=${NONE} ${exp_limits}=${NONE}
${resources_dict}= Get Pod Hardware Resources And Limits label_selector=${pod_label_selector}
Expand All @@ -146,15 +150,15 @@ Container Hardware Resources Should Match Expected
Dictionary Should Not Contain Key ${resources_dict} requests
ELSE
${requests}= Set Variable ${resources_dict}[requests]
FOR ${index} ${resource} IN ENUMERATE @{requests.keys()}
FOR ${index} ${resource} IN ENUMERATE @{exp_requests.keys()}
Should Be Equal As Strings ${requests}[${resource}] ${exp_requests}[${resource}]
END
END
IF ${exp_limits} == ${NONE}
Dictionary Should Not Contain Key ${resources_dict} limits
ELSE
${limits}= Set Variable ${resources_dict}[limits]
FOR ${index} ${resource} IN ENUMERATE @{limits.keys()}
FOR ${index} ${resource} IN ENUMERATE @{exp_limits.keys()}
Should Be Equal As Strings ${limits}[${resource}] ${exp_limits}[${resource}]
END
END
Expand Down
6 changes: 3 additions & 3 deletions ods_ci/tests/Resources/ODS.robot
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ Get "Usage Data Collection" Key

Is Usage Data Collection Enabled
[Documentation] Returns a boolean with the value of configmap odh-segment-key-config > segmentKeyEnabled
... which can be seen also in ODS Dashboard > Cluster Settings > "Usage Data Collection"
... which can be seen also in ODS Dashboard > Cluster settings > "Usage Data Collection"
${usage_data_collection_enabled}= Run
... oc get configmap odh-segment-key-config -n ${APPLICATIONS_NAMESPACE} -o jsonpath='{.data.segmentKeyEnabled}'
${usage_data_collection_enabled}= Convert To Boolean ${usage_data_collection_enabled}
RETURN ${usage_data_collection_enabled}

Usage Data Collection Should Be Enabled
[Documentation] Fails if "Usage Data Collection" is not enabled in ODS Dashboard > Cluster Settings
[Documentation] Fails if "Usage Data Collection" is not enabled in ODS Dashboard > Cluster settings
[Arguments] ${msg}="Usage Data Collection" should be enabled
${enabled}= ODS.Is Usage Data Collection Enabled
Should Be True ${enabled} msg=${msg}

Usage Data Collection Should Not Be Enabled
[Documentation] Fails if "Usage Data Collection" is enabled in ODS Dashboard > Cluster Settings
[Documentation] Fails if "Usage Data Collection" is enabled in ODS Dashboard > Cluster settings
[Arguments] ${msg}="Usage Data Collection" should not be enabled
${enabled}= ODS.Is Usage Data Collection Enabled
Should Not Be True ${enabled} msg=${msg}
Expand Down
Loading

0 comments on commit 51b27ad

Please sign in to comment.