Skip to content

Commit a87ce47

Browse files
starpitstarpit
committed
test: add test for mcad + coscheduler
1 parent 386fb11 commit a87ce47

File tree

8 files changed

+44
-16
lines changed

8 files changed

+44
-16
lines changed

‎.github/workflows/kind.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest]
1616
node-version: [16.x]
17-
profile: [keep-it-simple, ray-autoscaler, mcad-default]
17+
profile: [keep-it-simple, ray-autoscaler, mcad-default, mcad-coscheduler]
1818

1919
steps:
2020
- uses: actions/checkout@v3

‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"typescript": "4.7.4"
113113
},
114114
"dependencies": {
115-
"@guidebooks/store": "^0.2.2",
115+
"@guidebooks/store": "^0.2.3",
116116
"@kui-shell/client": "file:./plugins/plugin-client-default",
117117
"@kui-shell/core": "11.5.0-dev-20220807-191654",
118118
"@kui-shell/plugin-bash-like": "11.5.0-dev-20220807-191654",

‎tests/kind/profiles/keep-it-simple

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Run Locally####Run on a Kubernetes Cluster": "Run on a Kubernetes Cluster",
1919
"expand(kubectl config get-contexts -o name, Kubernetes contexts)": "kind-codeflare-test",
2020
"expand([ -z ${KUBE_CONTEXT} ] && exit 1 || X=$(kubectl ${KUBE_CONTEXT_ARG} get ns -o name || oc ${KUBE_CONTEXT_ARG} get projects -o name); echo \"$X\" | sed -E 's#(namespace|project.project.openshift.io)/##' | grep -Ev 'openshift|kube-', Kubernetes namespaces)####Create a namespace": "default",
21-
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1Gi\",\"Head Memory\":\"1Gi\"}",
21+
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1.5Gi\",\"Head Memory\":\"1.5Gi\"}",
2222
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Keep It Simple"
2323
}
24-
}
24+
}

‎tests/kind/profiles/mcad-coscheduler

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "mcad-coscheduler",
3+
"creationTime": 1660657756574,
4+
"lastModifiedTime": 1660747919298,
5+
"lastUsedTime": 1660755725660,
6+
"choices": {
7+
"madwizard/apriori/use-gpu": "don't use gpus",
8+
"madwizard/apriori/arch": "x64",
9+
"madwizard/apriori/platform": "darwin",
10+
"madwizard/apriori/mac-installer": "Homebrew",
11+
"madwizard/apriori/in-terminal": "HTML",
12+
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13+
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
14+
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
15+
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
16+
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
17+
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
18+
"Run Locally####Run on a Kubernetes Cluster": "Run on a Kubernetes Cluster",
19+
"expand(kubectl config get-contexts -o name, Kubernetes contexts)": "kind-codeflare-test",
20+
"expand([ -z ${KUBE_CONTEXT} ] && exit 1 || X=$(kubectl ${KUBE_CONTEXT_ARG} get ns -o name || oc ${KUBE_CONTEXT_ARG} get projects -o name); echo \"$X\" | sed -E 's#(namespace|project.project.openshift.io)/##' | grep -Ev 'openshift|kube-', Kubernetes namespaces)####Create a namespace": "default",
21+
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"250m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1.5Gi\",\"Head Memory\":\"1.5Gi\"}",
22+
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Use the Multi-user Enhanced Kubernetes Scheduler",
23+
"My administrator has already installed and configured MCAD####MCAD with the Advanced Coscheduler####MCAD with the Default Kubernetes Scheduler": "MCAD with the Advanced Coscheduler"
24+
}
25+
}

‎tests/kind/profiles/mcad-default

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Run Locally####Run on a Kubernetes Cluster": "Run on a Kubernetes Cluster",
1919
"expand(kubectl config get-contexts -o name, Kubernetes contexts)": "kind-codeflare-test",
2020
"expand([ -z ${KUBE_CONTEXT} ] && exit 1 || X=$(kubectl ${KUBE_CONTEXT_ARG} get ns -o name || oc ${KUBE_CONTEXT_ARG} get projects -o name); echo \"$X\" | sed -E 's#(namespace|project.project.openshift.io)/##' | grep -Ev 'openshift|kube-', Kubernetes namespaces)####Create a namespace": "default",
21-
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"250m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1Gi\",\"Head Memory\":\"1Gi\"}",
21+
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"250m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1.5Gi\",\"Head Memory\":\"1.5Gi\"}",
2222
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Use the Multi-user Enhanced Kubernetes Scheduler",
2323
"My administrator has already installed and configured MCAD####MCAD with the Advanced Coscheduler####MCAD with the Default Kubernetes Scheduler": "MCAD with the Default Kubernetes Scheduler"
2424
}

‎tests/kind/profiles/ray-autoscaler

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Run Locally####Run on a Kubernetes Cluster": "Run on a Kubernetes Cluster",
1919
"expand(kubectl config get-contexts -o name, Kubernetes contexts)": "kind-codeflare-test",
2020
"expand([ -z ${KUBE_CONTEXT} ] && exit 1 || X=$(kubectl ${KUBE_CONTEXT_ARG} get ns -o name || oc ${KUBE_CONTEXT_ARG} get projects -o name); echo \"$X\" | sed -E 's#(namespace|project.project.openshift.io)/##' | grep -Ev 'openshift|kube-', Kubernetes namespaces)####Create a namespace": "default",
21-
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"350m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1Gi\",\"Head Memory\":\"1Gi\"}",
21+
"Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"350m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1.5Gi\",\"Head Memory\":\"1.5Gi\"}",
2222
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Use the Ray Autoscaler"
2323
}
24-
}
24+
}

‎tests/kind/run.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env bash
22

3+
set -e
4+
set -o pipefail
5+
36
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
47
. "$SCRIPTDIR"/values.sh
58

@@ -77,8 +80,8 @@ else
7780
fi
7881

7982
if [ -n "$HEAD_POLLER_PID" ]; then
80-
kill $HEAD_POLLER_PID
83+
(kill $HEAD_POLLER_PID || exit 0)
8184
fi
8285
if [ -n "$WORKER_POLLER_PID" ]; then
83-
kill $WORKER_POLLER_PID
86+
(kill $WORKER_POLLER_PID || exit 0)
8487
fi

0 commit comments

Comments
 (0)