feat: allow BYOC to specify command line prefix

starpit · starpit · commit 66b609d9013e · 2023-03-05T17:59:22.000-05:00
guidebooks/store#602 Also minor update to madwizard to improve alignment of form elements guidebooks/madwizard#666
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": "^5.4.10",
+    "@guidebooks/store": "^5.5.0",
     "@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": "^6.2.8",
+    "madwizard": "^6.2.9",
     "needle": "^3.2.0",
     "open": "^8.4.2",
     "pretty-bytes": "^6.1.0",
diff --git a/tests/kind/profiles/gpu1/keep-it-simple b/tests/kind/profiles/gpu1/keep-it-simple
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"1\",\"Number of GPUs\":\"1\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"5Gi\",\"Head Memory\":\"1.5Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu1/keep-it-simple b/tests/kind/profiles/non-gpu1/keep-it-simple
@@ -2,7 +2,7 @@
   "name": "keep-it-simple",
   "creationTime": 1664149787016,
   "lastModifiedTime": 1676828268772,
-  "lastUsedTime": 1677870297449,
+  "lastUsedTime": 1678037434914,
   "choices": {
     "madwizard/apriori/use-gpu": "don't use gpus",
     "madwizard/apriori/arch": "x64",
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu1/mcad-coscheduler b/tests/kind/profiles/non-gpu1/mcad-coscheduler
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu1/mcad-default b/tests/kind/profiles/non-gpu1/mcad-default
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu1/mcad-preinstalled b/tests/kind/profiles/non-gpu1/mcad-preinstalled
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu1/ray-autoscaler b/tests/kind/profiles/non-gpu1/ray-autoscaler
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"0\",\"Maximum Workers\":\"0\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"2.5Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu2/keep-it-simple b/tests/kind/profiles/non-gpu2/keep-it-simple
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu3/keep-it-simple b/tests/kind/profiles/non-gpu3/keep-it-simple
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
diff --git a/tests/kind/profiles/non-gpu4/keep-it-simple b/tests/kind/profiles/non-gpu4/keep-it-simple
@@ -11,7 +11,7 @@
     "madwizard/apriori/in-terminal": "HTML",
     "ml/codeflare": "Submit a new Run",
     "ml/codeflare/run": "Bring Your Own Code",
-    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
+    "ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\",\"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 CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
