X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2FMakefile;h=7a8db06456aeda985d258fb529e09a9dcff29c4d;hb=21757af846776cf5005e06d8c4a9c9dfd4eb6b6e;hp=f81585faf5ba15c181d9962bc6d40a56ec7ab86b;hpb=1a8e3c3133f0b6c355689875abd57c481f3a1e81;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index f81585fa..7a8db064 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,7 +1,9 @@
-.PHONY: all clean helm base cba clean_all package
+.PHONY: all clean helm base clean_all package cba jsonlint_cba
 DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
 NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
 CBA_NAME ?= CBA
+_type_files = $(wildcard cba/Definitions/*_types.json)
+
 
 clean_all:
 	$(MAKE) clean
@@ -17,7 +19,7 @@ all: package helm base cba
 	cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip  ../automation/vsp/
 
 helm: package
-	make -C helm
+	$(MAKE) -C helm
 	mv helm/helm_*.tgz package_native/
 	mv helm/*.tgz package_dummy/
 
@@ -43,3 +45,12 @@ clean:
 	rm -rf cba_dummy
 	rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip
 	rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip
+
+jsonlint_cba: $(_type_files)
+	@:
+
+#This shouldn't be PHONY, but it's easier now to define this way
+.PHONY: $(_type_files)
+$(_type_files):
+	@which jq expand unexpand sponge >/dev/null
+	jq -S . <$@ | unexpand -t 2 | expand -t 4 | sponge $@