Merge branch 'main' into removeCodeflareSubscription

opendatahub-io · Nov 2, 2023 · dccc83b · dccc83b
2 parents 16bf414 + bd00817
commit dccc83b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -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 -->

diff --git a/codeflare-stack/base/codeflare-notebook-imagestream.yaml b/codeflare-stack/base/codeflare-notebook-imagestream.yaml
@@ -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
diff --git 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/ray_test.go b/tests/integration/ray_test.go
@@ -38,10 +38,6 @@ func TestRayCluster(t *testing.T) {
 	test := support.With(t)
 	test.T().Parallel()
 
-	// This test is unstable. It seems that RayJob CR sometimes trigger 2 jobs in Ray, causing confusion in KubeRay operator.
-	// Needs to be checked with newer KubeRay version. If still unstable then it needs to be reported.
-	test.T().Skip("Requires https://github.com/opendatahub-io/distributed-workloads/issues/65")
-
 	// Create a namespace
 	namespace := test.NewTestNamespace()
 

diff --git 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=1, head_memory=2, 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()"
    ]
   },
@@ -116,12 +105,6 @@
     "    finished = (str(status.state) == \"SUCCEEDED\")"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "id": "885ad96b",
-   "metadata": {},
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,