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

Enable mcad_ray_test #144

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Enable mcad_ray_test #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Integration of this stack into the Open Data Hub is owned by the Distributed Wor
|------------------------------|---------|
| CodeFlare Operator | v1.0.0-rc.1 |
| Multi-Cluster App Dispatcher | v1.35.0 |
| CodeFlare-SDK | v0.8.0 |
| CodeFlare-SDK | v0.10.1 |
| InstaScale | v0.0.9 |
| KubeRay | v0.6.0 |
<!-- Compatibility Matrix end -->
Expand Down
4 changes: 2 additions & 2 deletions codeflare-stack/base/codeflare-notebook-imagestream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ spec:
tags:
- annotations:
openshift.io/imported-from: quay.io/project-codeflare/notebook
name: v0.8.0
name: v0.10.1
from:
kind: DockerImage
name: quay.io/project-codeflare/notebook:v0.8.0
name: quay.io/project-codeflare/notebook:v0.10.1
importPolicy:
scheduled: true
4 changes: 1 addition & 3 deletions tests/integration/mcad_ray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ import (
func TestMCADRay(t *testing.T) {
test := cfosupport.With(t)

test.T().Skip("Requires https://github.com/project-codeflare/codeflare-sdk/issues/190")
Copy link
Contributor

Choose a reason for hiding this comment

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

It's likely the Ray head node resources have to be customised with project-codeflare/codeflare-sdk#190.


// Create a namespace
namespace := test.NewTestNamespace()

Expand Down Expand Up @@ -89,7 +87,7 @@ func TestMCADRay(t *testing.T) {
Should(
And(
HaveLen(1),
ContainElement(WithTransform(cfosupport.AppWrapperName, HavePrefix("mnistjob"))),
ContainElement(WithTransform(cfosupport.AppWrapperName, HavePrefix("mnisttest"))),
ContainElement(WithTransform(cfosupport.AppWrapperState, Equal(mcadv1beta1.AppWrapperStateActive))),
),
)
Expand Down
21 changes: 2 additions & 19 deletions tests/integration/resources/mnist_ray_mini.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"outputs": [],
"source": [
"# Create our cluster and submit appwrapper\n",
"cluster = Cluster(ClusterConfiguration(namespace=namespace, name='mnisttest', num_workers=1, min_cpus=1, max_cpus=1, min_memory=4, max_memory=4, num_gpus=0, instascale=False))"
"cluster = Cluster(ClusterConfiguration(namespace=namespace, name='mnisttest', head_cpus=1, head_memory=2, num_workers=1, min_cpus=1, max_cpus=1, min_memory=4, max_memory=4, num_gpus=0, instascale=False))"
]
},
{
Expand All @@ -53,18 +53,7 @@
"outputs": [],
"source": [
"# Bring up the cluster\n",
"cluster.up()"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "a99d5aff",
"metadata": {
"tags": []
},
"outputs": [],
"source": [
"cluster.up()\n",
"cluster.wait_ready()"
]
},
Expand Down Expand Up @@ -116,12 +105,6 @@
" finished = (str(status.state) == \"SUCCEEDED\")"
]
},
{
"cell_type": "markdown",
"id": "885ad96b",
"metadata": {},
"source": []
},
{
"cell_type": "code",
"execution_count": null,
Expand Down
Loading