Skip to content

Commit ffd3ef7

Browse files
committed
Ensure the openstacks crd exists in kuttl tests
Instead of just checking for any openstack.org crd, check explicitely for openstacks.operator.openstack.org, and wait until that is available. In some CI jobs, we run kuttl test for other operators before the openstack-operators one. That means that the current check interprets the fact that there are some openstack crds as being ready. Then when it tries to get openstacks.operator.openstack.org, it fails because it's not present yet. Also remove the '|| true' at the end of the command, since that ignores any error that might occurr.
1 parent b12911f commit ffd3ef7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,8 +2037,8 @@ openstack_kuttl_run: ## runs kuttl tests for the openstack operator, assumes tha
20372037
openstack_kuttl: export NAMESPACE = ${OPENSTACK_KUTTL_NAMESPACE}
20382038
openstack_kuttl: input deploy_cleanup openstack openstack_deploy_prep ## runs kuttl tests for the openstack operator. Installs openstack operator and cleans up previous deployments before running the tests, cleans up after running the tests.
20392039
# Wait until OLM installs openstack CRDs
2040-
timeout $(TIMEOUT) bash -c "while ! (oc get crd | grep openstack.org); do sleep 1; done"
2041-
bash -c '(oc get crd openstacks.operator.openstack.org && make openstack_init) || true'
2040+
timeout $(TIMEOUT) bash -c "while ! (oc get crd openstacks.operator.openstack.org); do sleep 1; done"
2041+
make openstack_init
20422042
$(eval $(call vars,$@,ansibleee))
20432043
make wait
20442044
$(eval $(call vars,$@,infra))

0 commit comments

Comments
 (0)