From 37e4bc892703b9f2c6159240c66944a4704a2b04 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 10 Dec 2024 17:26:47 +0100 Subject: [PATCH] [rhoso] disable nmstate + nncp 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 --- .../deploy/openstack-k8s-operators-deploy-commands.sh | 2 ++ .../kuttl/openstack-k8s-operators-kuttl-commands.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh b/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh index c9e4327c01fc..8e3060748b76 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh +++ b/ci-operator/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/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh b/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh index 5a09f2f8fad9..5c38caa0231e 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh +++ b/ci-operator/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