Skip to content

Commit 0afa252

Browse files
Create e2e scenario covering upgrade during training
1 parent 2d99cc9 commit 0afa252

File tree

5 files changed

+79
-370
lines changed

5 files changed

+79
-370
lines changed

Diff for: .github/workflows/olm_tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ jobs:
122122
BUNDLE_PUSH_OPT: "--tls-verify=false"
123123
CATALOG_PUSH_OPT: "--tls-verify=false"
124124

125-
- name: Run OLM Upgrade e2e Ray cluster Up test
125+
- name: Run OLM Upgrade e2e AppWrapper creation test
126126
run: |
127127
export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
128128
echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
129129
set -euo pipefail
130-
go test -timeout 30m -v ./test/upgrade -run TestMNISTRayClusterUp -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
130+
go test -timeout 30m -v ./test/upgrade -run TestMNISTCreateAppWrapper -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
131131
132132
- name: Update Operator to the built version
133133
run: |
@@ -158,12 +158,12 @@ jobs:
158158
SUBSCRIPTION_NAME: "codeflare-operator"
159159
SUBSCRIPTION_NAMESPACE: "openshift-operators"
160160

161-
- name: Run OLM Upgrade e2e Ray cluster Job submit test
161+
- name: Run OLM Upgrade e2e Appwrapper Job status test to monitor training
162162
run: |
163163
export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
164164
echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
165165
set -euo pipefail
166-
go test -timeout 30m -v ./test/upgrade -run TestMnistJobSubmit -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
166+
go test -timeout 30m -v ./test/upgrade -run TestMNISTCheckAppWrapperStatus -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
167167
168168
- name: Run e2e tests against built operator
169169
run: |

Diff for: go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require (
66
github.com/onsi/gomega v1.27.10
77
github.com/openshift/api v0.0.0-20230213134911-7ba313770556
88
github.com/project-codeflare/codeflare-common v0.0.0-20231129165224-988ba1da9069
9+
github.com/project-codeflare/instascale v0.3.1
910
github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.1
1011
github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1
1112
go.uber.org/zap v1.26.0

Diff for: test/e2e/mnist_rayjob.py

-44
This file was deleted.

Diff for: test/e2e/start_ray_cluster.py

-51
This file was deleted.

0 commit comments

Comments
 (0)