Makefile library merge with onf-make and voltha-lib-go
makefiles/
----------
o Import standalone makefile directories to checkin smaller parts of a mega patch.
o Build out directory hierarchy by topic and feature.
makefiles/lint/yaml/
--------------------
o Pull in logic evolved in repo:voltha-lib-go.
o Refactoring: support special snowflake targets by repository.
o ci-management and voltha-lib-go use distinct yamllint.conf files.
o Separate until there is time to review and consolidate.
o Added deps for on-demand local install of yamllint.
- requirements.txt could be used but every build would incur overhead.
Makefile
--------
o Use latest syntax from repo:onf-make.
o No need to set path variables, makefiles/include.mk can infer them.
o Added a help target to explicitly display targets and suggestions.
o Logic is bundled in libraries and use of 'make help' is not well known.
Change-Id: Id8eba6f914a7bfe9a31637901bd8fb78a387e0c2
diff --git a/makefiles/jjb/include.mk b/makefiles/jjb/include.mk
index e61ad7c..7d213b4 100644
--- a/makefiles/jjb/include.mk
+++ b/makefiles/jjb/include.mk
@@ -23,12 +23,12 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-include $(MAKEDIR)/jjb/help.mk
-include $(MAKEDIR)/jjb/required.mk
+include $(ONF_MAKEDIR)/jjb/help.mk
+include $(ONF_MAKEDIR)/jjb/required.mk
ifdef USE-ONF-JJB-MK
# Dynamic loading when targets are requested by name
- include $(ONF_MAKE)/jjb/targets.mk
+ include $(ONF_MAKEDIR)/jjb/targets.mk
endif
# [EOF]
diff --git a/makefiles/jjb/targets.mk b/makefiles/jjb/targets.mk
index 17fc78f..730d229 100644
--- a/makefiles/jjb/targets.mk
+++ b/makefiles/jjb/targets.mk
@@ -36,13 +36,12 @@
jjb-gen-log := $(jjb-gen-dir)/jjb-gen.log
jjb-gen:
+ $(call banner-enter,Target $@)
@mkdir -p $(jjb-gen-dir)
-
- @echo
- @echo "** Generating pipelines (target: $@)"
@touch "$(jjb-gen-dir)/.sentinel"
- ( jenkins-jobs test $(PWD)/jjb -o $(jjb-gen-dir) 3>&1 2>&1 )\
- > "$(jjb-gen-log)"
+ ( $(activate) \
+ && jenkins-jobs test $(PWD)/jjb -o $(jjb-gen-dir) 3>&1 2>&1 \
+ ) | tee "$(jjb-gen-log)"
ifdef LOGS
-@less "$(jjb-gen-log)"
@@ -54,6 +53,8 @@
find "$(jjb-gen-dir)" -newer "$(jjb-gen-dir)/.sentinel" -ls
endif
+ $(call banner-leave,Target $@)
+
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
sterile ::