feat: do not automatically bring down cluster on ctrl+c

also picks up mcad resource adjustments to improve test stability
project-codeflare · Mar 31, 2023 · d4d7877 · d4d7877
1 parent b65ebc3
commit d4d7877
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/plugin-codeflare/package.json b/plugins/plugin-codeflare/package.json
@@ -30,13 +30,13 @@
     "@types/split2": "^3.2.1"
   },
   "dependencies": {
-    "@guidebooks/store": "^7.2.9",
+    "@guidebooks/store": "^7.3.1",
     "@logdna/tail-file": "^3.0.1",
     "@patternfly/react-charts": "^6.94.18",
     "@patternfly/react-core": "^4.276.6",
     "asciinema-player": "^3.1.0",
     "chokidar": "^3.5.3",
-    "madwizard": "^7.0.4",
+    "madwizard": "^7.2.1",
     "needle": "^3.2.0",
     "open": "^8.4.2",
     "pretty-bytes": "^6.1.0",

diff --git a/tests/kind/profiles/non-gpu1/mcad-coscheduler.arm64 b/tests/kind/profiles/non-gpu1/mcad-coscheduler.arm64
@@ -1,8 +1,8 @@
 {
-  "name": "mcad-coscheduler",
+  "name": "mcad-coscheduler.arm64",
   "creationTime": 1660657756574,
   "lastModifiedTime": 1664150418757,
-  "lastUsedTime": 1677700501499,
+  "lastUsedTime": 1680221854788,
   "choices": {
     "madwizard/apriori/use-gpu": "don't use gpus",
     "madwizard/apriori/arch": "arm64",
@@ -14,13 +14,7 @@
     "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.3.0-py38-aarch64\",\"Command line prefix\":\"python3 main.py\"}",
     "kubernetes/choose/secret/image-pull": "No secret needed, since my image is public",
     "s3/choose/bucket/maybe": "My data is not stored in S3",
-    "ml/ray/start/resources": {
-      "Number of Workers": 0,
-      "CPUs per worker": "2",
-      "GPUs per worker": 0,
-      "Memory per worker": "2.5Gi",
-      "Ephemeral Storage per worker": "5Gi"
-    },
+    "ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"2\",\"GPUs per worker\":0,\"Memory per worker\":\"2.5Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
     "kubernetes/choose/ns": "default",
     "ml/ray/storage/s3/maybe": "My code does not use Ray Workflows",
@@ -30,4 +24,4 @@
     "kubernetes/mcad/choose/job-priority": "Default Priority",
     "kubernetes/mcad/choose/scheduler": "MCAD with the Advanced Coscheduler"
   }
-}
+}
diff --git a/tests/kind/profiles/non-gpu1/mcad-coscheduler.x86_64 b/tests/kind/profiles/non-gpu1/mcad-coscheduler.x86_64
@@ -16,9 +16,9 @@
     "s3/choose/bucket/maybe": "My data is not stored in S3",
     "ml/ray/start/resources": {
       "Number of Workers": 0,
-      "CPUs per worker": "300m",
+      "CPUs per worker": "600m",
       "GPUs per worker": 0,
-      "Memory per worker": "2.5Gi",
+      "Memory per worker": "3Gi",
       "Ephemeral Storage per worker": "5Gi"
     },
     "kubernetes/context": "kind-codeflare-test",

diff --git a/tests/kind/profiles/non-gpu1/mcad-default.arm64 b/tests/kind/profiles/non-gpu1/mcad-default.arm64
@@ -2,7 +2,7 @@
   "name": "mcad-default.arm64",
   "creationTime": 1660657756574,
   "lastModifiedTime": 1660747919298,
-  "lastUsedTime": 1680126433820,
+  "lastUsedTime": 1680221369322,
   "choices": {
     "madwizard/apriori/use-gpu": "don't use gpus",
     "madwizard/apriori/arch": "arm64",
@@ -24,4 +24,4 @@
     "kubernetes/mcad/choose/job-priority": "Default Priority",
     "kubernetes/mcad/choose/scheduler": "MCAD with the Default Kubernetes Scheduler"
   }
-}
+}
diff --git a/tests/kind/profiles/non-gpu1/mcad-default.x86_64 b/tests/kind/profiles/non-gpu1/mcad-default.x86_64
@@ -14,7 +14,7 @@
     "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0-py38\",\"Command line prefix\":\"python3 main.py\"}",
     "kubernetes/choose/secret/image-pull": "No secret needed, since my image is public",
     "s3/choose/bucket/maybe": "My data is not stored in S3",
-    "ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"300m\",\"GPUs per worker\":0,\"Memory per worker\":\"2.5Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
+    "ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"800m\",\"GPUs per worker\":0,\"Memory per worker\":\"4Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
     "kubernetes/context": "kind-codeflare-test",
     "kubernetes/choose/ns": "default",
     "ml/ray/storage/s3/maybe": "My code does not use Ray Workflows",

diff --git a/tests/kind/profiles/non-gpu1/mcad-preinstalled.x86_64 b/tests/kind/profiles/non-gpu1/mcad-preinstalled.x86_64
@@ -16,9 +16,9 @@
     "s3/choose/bucket/maybe": "My data is not stored in S3",
     "ml/ray/start/resources": {
       "Number of Workers": 0,
-      "CPUs per worker": "300m",
+      "CPUs per worker": "800m",
       "GPUs per worker": 0,
-      "Memory per worker": "2.5Gi",
+      "Memory per worker": "4Gi",
       "Ephemeral Storage per worker": "5Gi"
     },
     "kubernetes/context": "kind-codeflare-test",