Skip to content

Commit

Permalink
openstack_wait: call 'make openstack' dynamically
Browse files Browse the repository at this point in the history
In some cases CI might end up calling 'make openstack' multiple
times when using openstack_wait. This updates the Makefile
dependency here to be dynamic and only call 'make openstack'
if a subscription isn't found for the operator.
  • Loading branch information
dprince committed Dec 18, 2024
1 parent 5075cd2 commit f75cf66
Showing 1 changed file with 3 additions and 1 deletion.
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

0 comments on commit f75cf66

Please sign in to comment.