Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[vFW_CNF_CDS] Sort generated json files
[demo.git]
/
heat
/
vFW_CNF_CDS
/
templates
/
Makefile
diff --git
a/heat/vFW_CNF_CDS/templates/Makefile
b/heat/vFW_CNF_CDS/templates/Makefile
index
7ca4ac0
..
7a8db06
100644
(file)
--- a/
heat/vFW_CNF_CDS/templates/Makefile
+++ b/
heat/vFW_CNF_CDS/templates/Makefile
@@
-1,29
+1,33
@@
-.PHONY: all clean helm base c
ba clean_all
+.PHONY: all clean helm base c
lean_all package cba jsonlint_cba
DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
CBA_NAME ?= 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
$(MAKE) all
#Can't use .csar extension or SDC will panic
clean_all:
$(MAKE) clean
$(MAKE) all
#Can't use .csar extension or SDC will panic
-all: package
/
helm base cba
+all: package helm base cba
cd package_dummy/ && zip -r $(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
cd package_native/ && zip -r $(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
mv package_dummy/$(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
mv package_native/$(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
cd package_dummy/ && zip -r $(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
cd package_native/ && zip -r $(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
mv package_dummy/$(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
mv package_native/$(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
+ cp $(DUMMY_ONBOARDING_PACKAGE_NAME).zip ../automation/vsp/
+ cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip ../automation/vsp/
-helm: package
/
-
make
-C helm
+helm: package
+
$(MAKE)
-C helm
mv helm/helm_*.tgz package_native/
mv helm/*.tgz package_dummy/
mv helm/helm_*.tgz package_native/
mv helm/*.tgz package_dummy/
-base: package
/
+base: package
cp base_dummy/* package_dummy/
cp base_native/* package_native/
cp base_dummy/* package_dummy/
cp base_native/* package_native/
-cba: package
/
+cba: package
cp -r cba cba_dummy
sed -i 's/"helm_/"/g' cba_dummy/Definitions/vFW_CNF_CDS.json
cd cba_dummy/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\*
cp -r cba cba_dummy
sed -i 's/"helm_/"/g' cba_dummy/Definitions/vFW_CNF_CDS.json
cd cba_dummy/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\*
@@
-31,7
+35,7
@@
cba: package/
mv cba/$(CBA_NAME).zip package_native/
mv cba_dummy/$(CBA_NAME).zip package_dummy/
mv cba/$(CBA_NAME).zip package_native/
mv cba_dummy/$(CBA_NAME).zip package_dummy/
-package
/
:
+package:
mkdir package_dummy/
mkdir package_native/
mkdir package_dummy/
mkdir package_native/
@@
-41,3
+45,12
@@
clean:
rm -rf cba_dummy
rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip
rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip
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 $@