Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openstack_wait: call 'make openstack' dynamically #984

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -734,8 +734,10 @@ openstack: openstack_prep operator_namespace ## installs the operator, also runs
oc apply -f ${OPERATOR_DIR}

.PHONY: openstack_wait
openstack_wait: openstack ## waits openstack CSV to succeed.
openstack_wait: ## waits openstack CSV to succeed.
$(eval $(call vars,$@,openstack))
# call make_openstack if it isn't already
bash -c '(oc get subscription -n openstack-operators openstack-operator || make openstack) || true'
timeout $(TIMEOUT) bash -c 'until $$(oc get csv -l operators.coreos.com/openstack-operator.openstack-operators -n ${OPERATOR_NAMESPACE} | grep -q Succeeded); do sleep 1; done'


Expand Down