From bcaa0e8e6b69140f110e769b73a9af9686475070 Mon Sep 17 00:00:00 2001 From: ChristianZaccaria Date: Thu, 19 Oct 2023 12:05:46 +0100 Subject: [PATCH] Enable mcad_ray_test --- tests/integration/mcad_ray_test.go | 4 +--- .../integration/resources/mnist_ray_mini.ipynb | 17 +++-------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/tests/integration/mcad_ray_test.go b/tests/integration/mcad_ray_test.go index d26b88f5..9b48a305 100644 --- a/tests/integration/mcad_ray_test.go +++ b/tests/integration/mcad_ray_test.go @@ -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") - // Create a namespace namespace := test.NewTestNamespace() @@ -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))), ), ) diff --git a/tests/integration/resources/mnist_ray_mini.ipynb b/tests/integration/resources/mnist_ray_mini.ipynb index 39d7d84d..a5b61153 100644 --- a/tests/integration/resources/mnist_ray_mini.ipynb +++ b/tests/integration/resources/mnist_ray_mini.ipynb @@ -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=2, head_memory=8, num_workers=1, min_cpus=1, max_cpus=1, min_memory=4, max_memory=4, num_gpus=0, instascale=False))" ] }, { @@ -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()" ] }, @@ -99,7 +88,7 @@ "metadata": {}, "outputs": [], "source": [ - "job = DDPJobDefinition(name=\"mnisttest\", script=\"mnist.py\", workspace=\"file:///opt/app-root/notebooks/..data\", scheduler_args={\"requirements\": \"/opt/app-root/notebooks/requirements.txt\"}).submit(cluster)" + "job = DDPJobDefinition(name=\"mnisttest\", script=\"mnist.py\", workspace=\"file:///opt/app-root/notebooks-ray/..data\", scheduler_args={\"requirements\": \"/opt/app-root/notebooks-ray/requirements.txt\"}).submit(cluster)" ] }, {