Move placement kuttl tests under default kuttl namespace

Currently, zuul only runs default kuttl tests, thus placement kuttl tests were not getting validated. This commit ensure they are also tested.

Signed-off-by: Amartya Sinha <amsinha@redhat.com>

Author: amartyasinha

Makefile

@@ -411,7 +411,7 @@ kuttl-test-prep:
 
 .PHONY: kuttl-test-run
 kuttl-test-run:
-	oc kuttl test --v 1 --start-kind=false --config $(KUTTL_SUITE_DIR)/config.yaml
+	KUTTL_SUITE_DIR=$(KUTTL_SUITE_DIR) oc kuttl test --v 1 --start-kind=false --config $(KUTTL_SUITE_DIR)/config.yaml
 
 .PHONY: kuttl-test
 kuttl-test: kuttl-test-prep kuttl-test-run
@@ -424,6 +424,7 @@ kuttl-test-cleanup:
 	# result in errors in mariadb- and keystone-operator and then
 	# finalizer removal get stuck blocking the namespace deletion.
 	if [ "${namespace_exists}" != "" ]; then \
+		oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s PlacementAPI; \
 		oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s Nova; \
 		oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s OpenStackControlPlane; \
 		oc delete --wait=true namespace $(KUTTL_NAMESPACE); \

README.md

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: nova-kuttl-multi-cell
+  name: nova-kuttl-default

test/kuttl/test-suites/default/deps/namespace.yaml

@@ -17,7 +17,7 @@ spec:
   secret: osp-secret
   serviceUser: placement
 status:
-  databaseHostname: openstack.placement-kuttl-tests.svc
+  databaseHostname: openstack.nova-kuttl-default.svc
   readyCount: 1
   conditions:
   - message: Setup complete
@@ -259,14 +259,14 @@ kind: TestAssert
 namespaced: true
 commands:
   - script: |
-      . $PLACEMENT_KUTTL_DIR/../lib/helper_functions.sh
-      apiEndpoints=$(oc get -n $NAMESPACE KeystoneEndpoint placement -o go-template-file=$PLACEMENT_KUTTL_DIR/../go_templates/apiEndpoints.gotemplate)
+      . ${KUTTL_SUITE_DIR}/lib/helper_functions.sh
+      apiEndpoints=$(oc get -n $NAMESPACE KeystoneEndpoint placement -o go-template-file=${KUTTL_SUITE_DIR}/go_templates/apiEndpoints.gotemplate)
       assert_regex $apiEndpoints 'http:\/\/placement-internal\..+\.svc.*'
       assert_regex $apiEndpoints 'http:\/\/placement-public\..+\.svc.*'
 
       # when using image digests the containerImage URLs are SHA's so we verify them with a script
       tupleTemplate='{{ range (index .spec.template.spec.containers 0).env }}{{ .name }}{{ "#" }}{{ .value}}{{"\n"}}{{ end }}'
-      imageTuples=$(oc get -n openstack-operators deployment placement-operator-controller-manager -o go-template="$tupleTemplate")
+      imageTuples=$(oc get -n openstack-operators deployment nova-operator-controller-manager -o go-template="$tupleTemplate")
       # format of imageTuple is: RELATED_IMAGE_PLACEMENT_<service>#<image URL with SHA> separated by newlines
       for ITEM in $(echo $imageTuples); do
         # it is an image
@@ -280,7 +280,7 @@ commands:
               ;;
           esac
           if [ "$SERVICE_IMAGE" != "$IMG_FROM_ENV" ]; then
-            echo "$NAME image does not equal $VALUE"
+            echo "$NAME image does not equal $IMG_FROM_ENV (got $SERVICE_IMAGE)"
             exit 1
           fi
         fi

…ent/go_templates/apiEndpoints.gotemplate …ult/go_templates/apiEndpoints.gotemplatetest/kuttl/test-suites/placement/go_templates/apiEndpoints.gotemplate renamed to test/kuttl/test-suites/default/go_templates/apiEndpoints.gotemplate test/kuttl/test-suites/placement/go_templates/apiEndpoints.gotemplate renamed to test/kuttl/test-suites/default/go_templates/apiEndpoints.gotemplate

@@ -0,0 +1 @@
+../../../../../../config/samples/placement_v1beta1_placementapi.yaml