[rhoso] disable nmstate + nncp (openshift#59733)

openstack-k8s-operators/install_yamls#969 changed the way when to apply NNCPs. As a result NNCPs were created for the kuttl jobs which is wrong. This sets the env vars to disable nmstate and nncp creation. Signed-off-by: Martin Schuppert <[email protected]>
yingzhanredhat · Dec 18, 2024 · 3f0b6dd · 3f0b6dd
1 parent 8825d54
commit 3f0b6dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...r/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh b/...r/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh
@@ -89,6 +89,8 @@ DBSERVICE=$(make --eval $'var:\n\t@echo $(DBSERVICE)' NETWORK_ISOLATION=false va
 DBSERVICE_CONTAINER=$(make --eval $'var:\n\t@echo $(DBSERVICE_CONTAINER)' NETWORK_ISOLATION=false var)
 OPENSTACK_CTLPLANE=$(make --eval $'var:\n\t@echo $(OPENSTACK_CTLPLANE)' NETWORK_ISOLATION=false var)
 OPENSTACK_CTLPLANE_FILE=$(basename $OPENSTACK_CTLPLANE)
+export INSTALL_NNCP=false
+export INSTALL_NMSTATE=false
 
 # Deploy openstack operator
 make openstack OPENSTACK_IMG=${OPENSTACK_OPERATOR_INDEX} NETWORK_ISOLATION=false

diff --git a/...tor/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh b/...tor/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh
@@ -51,6 +51,8 @@ SERVICE_NAME=$(echo "${BASE_OP}" | sed 's/\(.*\)-operator/\1/')
 export IMAGE_TAG_BASE=${REGISTRY}/${ORGANIZATION}/${SERVICE_NAME}-operator
 export KUTTL_REPORT=kuttl-test-${SERVICE_NAME}.json
 export NETWORK_ISOLATION=false
+export INSTALL_NNCP=false
+export INSTALL_NMSTATE=false
 if [ ${SERVICE_NAME} == "openstack-ansibleee" ]; then
     # the service_name needs to be different to use in the image url than in
     # the environment variables