From a386a1d3a45a9cd3085bf9bcfbc29110712920e1 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 12 Dec 2024 09:53:48 -0500 Subject: [PATCH] Remove openstack_deploy_cleanup from openstack_init target This causes CI to fail when running init on a clean environment Now we just checkout the openstack-operator repo if it doesn't already exist --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 068588f..0c632d2 100644 --- a/Makefile +++ b/Makefile @@ -735,7 +735,8 @@ openstack_wait: openstack ## waits openstack CSV to succeed. # creates the new initialization resource for our operators .PHONY: openstack_init -openstack_init: openstack_wait openstack_deploy_cleanup openstack_repo +openstack_init: openstack_wait + test -f ${OPERATOR_BASE_DIR}/openstack-operator/config/samples/operator_v1beta1_openstack.yaml || make openstack_repo oc create -f ${OPERATOR_BASE_DIR}/openstack-operator/config/samples/operator_v1beta1_openstack.yaml oc wait openstack/openstack -n ${OPERATOR_NAMESPACE} --for condition=Ready --timeout=${TIMEOUT}