@@ -122,56 +122,59 @@ jobs:
122
122
BUNDLE_PUSH_OPT : " --tls-verify=false"
123
123
CATALOG_PUSH_OPT : " --tls-verify=false"
124
124
125
- - name : Run OLM Upgrade e2e AppWrapper creation test
126
- run : |
127
- export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
128
- echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
129
- set -euo pipefail
130
- go test -timeout 30m -v ./test/upgrade -run TestMNISTCreateAppWrapper -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
131
-
132
- - name : Update Operator to the built version
133
- run : |
134
- ORIGINAL_POD_NAME=$(kubectl get pod -l app.kubernetes.io/name=codeflare-operator -n openshift-operators -o json | jq -r .items[].metadata.name)
135
- echo "Running old operator pod name is ${ORIGINAL_POD_NAME}"
136
-
137
- echo Updating custom CatalogSource image to the built CatalogSource with latest operator
138
- kubectl patch CatalogSource codeflare-olm-test -n olm --type merge --patch "{\"spec\":{\"image\":\"${CATALOG_IMG}\"}}"
139
-
140
- echo Waiting for previous operator pod to get deleted
141
- kubectl wait --timeout=120s --for=delete pod/${ORIGINAL_POD_NAME} -n openshift-operators
142
-
143
- echo Waiting for Subscription to be ready
144
- kubectl wait -n ${{ env.SUBSCRIPTION_NAMESPACE }} subscription/${{ env.SUBSCRIPTION_NAME }} --for=jsonpath='{.status.state}'=AtLatestKnown --timeout=180s
145
-
146
- echo Waiting for Deployment to be ready
147
- timeout 60 bash -c 'until [[ $(kubectl get deployment/codeflare-operator-manager -n '${{ env.SUBSCRIPTION_NAMESPACE }}') ]]; do sleep 5 && echo "$(kubectl get deployment/codeflare-operator-manager -n '${{ env.SUBSCRIPTION_NAMESPACE }}')"; done'
148
- kubectl wait -n ${{ env.SUBSCRIPTION_NAMESPACE }} deployment/codeflare-operator-manager --for=condition=Available=true --timeout=60s
149
-
150
- echo Checking that correct CSV is available
151
- CSV_VERSION=$(kubectl get ClusterServiceVersion/codeflare-operator.${VERSION} -n openshift-operators -o json | jq -r .spec.version)
152
- if [ "v${CSV_VERSION}" != "${VERSION}" ]; then
153
- echo "CSV version v${CSV_VERSION} doesn't match expected version ${VERSION}"
154
- exit 1
155
- fi
156
- env :
157
- CATALOG_IMG : " ${{ env.REGISTRY_ADDRESS }}/codeflare-operator-catalog:v0.0.1"
158
- SUBSCRIPTION_NAME : " codeflare-operator"
159
- SUBSCRIPTION_NAMESPACE : " openshift-operators"
160
-
161
- - name : Run OLM Upgrade e2e Appwrapper Job status test to monitor training
162
- run : |
163
- export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
164
- echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
165
- set -euo pipefail
166
- go test -timeout 30m -v ./test/upgrade -run TestMNISTCheckAppWrapperStatus -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
167
-
168
- - name : Run e2e tests against built operator
169
- run : |
170
- export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
171
- echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
172
-
173
- set -euo pipefail
174
- go test -timeout 30m -v ./test/e2e -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
125
+ # TODO: Disabled during the MCAD to Kueue transition.
126
+ # We do not intend to support the scenario of in place updating
127
+ # from an MCAD-based Codeflare Operator to a Kueue-based one.
128
+ # - name: Run OLM Upgrade e2e AppWrapper creation test
129
+ # run: |
130
+ # export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
131
+ # echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
132
+ # set -euo pipefail
133
+ # go test -timeout 30m -v ./test/upgrade -run TestMNISTCreateAppWrapper -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
134
+
135
+ # - name: Update Operator to the built version
136
+ # run: |
137
+ # ORIGINAL_POD_NAME=$(kubectl get pod -l app.kubernetes.io/name=codeflare-operator -n openshift-operators -o json | jq -r .items[].metadata.name)
138
+ # echo "Running old operator pod name is ${ORIGINAL_POD_NAME}"
139
+
140
+ # echo Updating custom CatalogSource image to the built CatalogSource with latest operator
141
+ # kubectl patch CatalogSource codeflare-olm-test -n olm --type merge --patch "{\"spec\":{\"image\":\"${CATALOG_IMG}\"}}"
142
+
143
+ # echo Waiting for previous operator pod to get deleted
144
+ # kubectl wait --timeout=120s --for=delete pod/${ORIGINAL_POD_NAME} -n openshift-operators
145
+
146
+ # echo Waiting for Subscription to be ready
147
+ # kubectl wait -n ${{ env.SUBSCRIPTION_NAMESPACE }} subscription/${{ env.SUBSCRIPTION_NAME }} --for=jsonpath='{.status.state}'=AtLatestKnown --timeout=180s
148
+
149
+ # echo Waiting for Deployment to be ready
150
+ # timeout 60 bash -c 'until [[ $(kubectl get deployment/codeflare-operator-manager -n '${{ env.SUBSCRIPTION_NAMESPACE }}') ]]; do sleep 5 && echo "$(kubectl get deployment/codeflare-operator-manager -n '${{ env.SUBSCRIPTION_NAMESPACE }}')"; done'
151
+ # kubectl wait -n ${{ env.SUBSCRIPTION_NAMESPACE }} deployment/codeflare-operator-manager --for=condition=Available=true --timeout=60s
152
+
153
+ # echo Checking that correct CSV is available
154
+ # CSV_VERSION=$(kubectl get ClusterServiceVersion/codeflare-operator.${VERSION} -n openshift-operators -o json | jq -r .spec.version)
155
+ # if [ "v${CSV_VERSION}" != "${VERSION}" ]; then
156
+ # echo "CSV version v${CSV_VERSION} doesn't match expected version ${VERSION}"
157
+ # exit 1
158
+ # fi
159
+ # env:
160
+ # CATALOG_IMG: "${{ env.REGISTRY_ADDRESS }}/codeflare-operator-catalog:v0.0.1"
161
+ # SUBSCRIPTION_NAME: "codeflare-operator"
162
+ # SUBSCRIPTION_NAMESPACE: "openshift-operators"
163
+
164
+ # - name: Run OLM Upgrade e2e Appwrapper Job status test to monitor training
165
+ # run: |
166
+ # export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
167
+ # echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
168
+ # set -euo pipefail
169
+ # go test -timeout 30m -v ./test/upgrade -run TestMNISTCheckAppWrapperStatus -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
170
+
171
+ # - name: Run e2e tests against built operator
172
+ # run: |
173
+ # export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
174
+ # echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
175
+
176
+ # set -euo pipefail
177
+ # go test -timeout 30m -v ./test/e2e -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
175
178
176
179
- name : Print CodeFlare operator logs
177
180
if : always() && steps.deploy.outcome == 'success'
0 commit comments