Merge "Update repository to use repo:onf-make/makefiles"
diff --git a/Makefile b/Makefile
index b064411..8ac5167 100644
--- a/Makefile
+++ b/Makefile
@@ -55,12 +55,43 @@
# make help not widely in use yet so be explicit
help ::
+
@echo
@echo 'Usage: $(MAKE) help ...'
+
@echo ' % make clean sterile'
- @echo ' % make lint lint-jjb'
- @echo ' % make build # jjb-gen'
+ @printf ' %-33.33s %s\n' 'lint' \
+ 'Invoke syntax checking targets'
+ @printf ' %-33.33s %s\n' 'build' \
+ 'Invoke jenkins-jobs to regenerate pipelines'
@echo ' % make test'
@echo ' % make help # show all available targes'
+ @echo
+ @echo '[HELP: modifiers]'
+ @printf ' %-33.33s %s\n' '{topic}-help' \
+ 'Display extended help for individual makefile targets'
+ @printf ' %-33.33s %s\n' 'help-verbose' \
+ 'Display exhaustive help'
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+build-help :
+ @printf ' %-33.33s %s\n' 'build' \
+ 'Alias for $(MAKE) jjb-gen'
+ @printf ' %-33.33s %s\n' 'jjb-gen' \
+ 'Invoke jenkins-jobs to regenerate pipelines'
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+lint-help :
+ @printf ' %-33.33s %s\n' 'lint' \
+ 'Perform syntax checking on configured sources'
+ @printf ' %-33.33s %s\n' 'lint-jjb' \
+ 'Invoke jenkins-jobs to syntax check JJB source'
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+help-verbose :: help $(help-verbose)
+
# [EOF]
diff --git a/global-jjb b/global-jjb
index 89213a1..09979e2 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 89213a114af3775da43b5f97c3584db516d49987
+Subproject commit 09979e2fde9b92aa7bc00de4175a88d64fe9e33f
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 6d4f97b..c5c4e13 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -11,7 +11,7 @@
# https://docs.releng.linuxfoundation.org/projects/lftools/en/latest/commands/version.html
# https://docs.releng.linuxfoundation.org/projects/lftools/en/latest/release-notes.html#v0-35-11-4
# lftools
- lftools-version: '~=0.26.2'
+ lftools-version: '~=0.37.4'
# git module config
# LF templates require these to be set in later versions of global-jjb for git module
@@ -78,6 +78,8 @@
# default email address to send job failure messages
failure-email-address: 'cord-dev@opencord.org'
+ failure-notification: 'cord-dev@opencord.org'
+ failure-notification-prefix: "[releng]"
# regexp for gerrit triggers
# list of supported branches, for branch-regexp
diff --git a/packer/common-packer b/packer/common-packer
index 4a5b0cd..6485404 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 4a5b0cd9032938194c4813fe36663ddee4f9e60e
+Subproject commit 6485404dda02505f48cef60d9aafd726c3aacfa8