[VOL-5064] - Build and deploy voltha-system-tests
makefiles/
----------
o Copy in latest library makefiles from repo:onf-make
config.mk
makefiles/lint
--------------
o Support more lint targets
makefiles/virtualenv.mk
-----------------------
o Update to use library logic.
o Install/maintain .venv/ VS vst_venv.
o Proper dependency driven create when needed VS always install.
o Also support replacing inlined venv logic with library makefile logs.
makefiles/commands/kail.mk
--------------------------
o mkdir -p for interactive use when WORKSPACE= is set.
Makefile
--------
o Inline comment delimiters and help targets to improve readabilty.
o Call macro banner-enter/banner-leave to hilight target output.
o Change targets clean and help into double-colon rules so they
are included when library targets are processed.
o Update include $(MAKEDIR) imports, library makefiles are able to infer paths
and define MAKDIR=, ONF_MAKEDIR=.
o Define helper macro run-robot-test= allowing copy & paste robot command
line to be refactored and reduced.
o Define local target 'venv-install' allowing installation of the virtualenv
followed by patching so a newer interpreter can be used locally for testing.
o Shell command separator: replace ';' with '&&' to improve error detection.
o target=gendocs: Split run-on command line into independent steps, activate
script only applies to the for loop invoking tests.
Change-Id: Idc8efd89f36b9f4954d9394a6524e07aa2ea5531
diff --git a/makefiles/lint/license/include.mk b/makefiles/lint/license/include.mk
index c3569f3..431e45e 100644
--- a/makefiles/lint/license/include.mk
+++ b/makefiles/lint/license/include.mk
@@ -15,21 +15,27 @@
# limitations under the License.
# -----------------------------------------------------------------------
-ifndef mk-include--onf-lint-license# # one-time loader
-ifndef NO-LINT-LICENSE
+##-------------------##
+##---] GLOBALS [---##
+##-------------------##
-$(if $(DEBUG),$(warning ENTER))
+##-------------------##
+##---] TARGETS [---##
+##-------------------##
+ifndef NO-LINT-REUSE
+ lint : lint-license
+endif
-$(if $(USE_LINT_LICENSE)\
- ,$(eval include $(ONF_MAKEDIR)/lint/license/voltha-system-tests/include.mk)\
- ,$(eval include $(ONF_MAKEDIR)/lint/license/common.mk)\
-)
+## -----------------------------------------------------------------------
+## Intent: Perform a lint check on makefile sources
+## -----------------------------------------------------------------------
+lint-license:
+ reuse --root . lint
- mk-include--onf-lint-license := true
-
-$(if $(DEBUG),$(warning LEAVE))
-
-endif # NO-LINT-LICENSE
-endif # mk-include--onf-lint-license
+## -----------------------------------------------------------------------
+## Intent: Display command help
+## -----------------------------------------------------------------------
+help-summary ::
+ @echo ' lint-reuse License syntax checking'
# [EOF]
diff --git a/makefiles/lint/license/license-check.sh b/makefiles/lint/license/license-check.sh
index 73f72db..04978cf 100755
--- a/makefiles/lint/license/license-check.sh
+++ b/makefiles/lint/license/license-check.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-
# -----------------------------------------------------------------------
# Copyright 2022-2024 Open Networking Foundation (ONF) and the ONF Contributors
#
@@ -156,10 +155,12 @@
! -path "*/docs/*" \
! -name 'output.xml' \
! -path "*/vst_venv/*" \
+ ! -path '*/\.venv/*' \
! -name '*#*' \
! -path '*scripts/flog/*' \
! -name '*~' \
! -name 'VERSION' \
+ ! -name 'kail' \
! -name 'patch' \
-print0 )
diff --git a/makefiles/lint/license/voltha-system-tests/include.mk b/makefiles/lint/license/voltha-system-tests/include.mk
index ebbeb90..55ffedb 100644
--- a/makefiles/lint/license/voltha-system-tests/include.mk
+++ b/makefiles/lint/license/voltha-system-tests/include.mk
@@ -15,11 +15,19 @@
# limitations under the License.
# -----------------------------------------------------------------------
+<<<<<<< HEAD
.PHONY: lint-license-vst
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
lint : lint-license-vst
+=======
+.PHONY: lint-license
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+lint : lint-license
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
lint-license-gargs += --recursive
@@ -38,7 +46,11 @@
# TODO: Normalize into .venv for consistent filtering across projects.
lint-license-gargs += --exclude-dir='.git'
+<<<<<<< HEAD
lint-license-gargs += --exclude-dir='vst_venv'
+=======
+lint-license-gargs += --exclude-dir='$(venv-name)'
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
lint-license-gargs += --exclude-dir='flog'
lint-license-gargs += --exclude='*.json'
@@ -68,7 +80,11 @@
## -----------------------------------------------------------------------
## Jenkins job checking logic.
## -----------------------------------------------------------------------
+<<<<<<< HEAD
lint-license-vst:
+=======
+lint-license:
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
$(MAKEDIR)/lint/license/license-check.sh
## -----------------------------------------------------------------------
diff --git a/makefiles/lint/license/voltha-system-tests/license-check.sh b/makefiles/lint/license/voltha-system-tests/license-check.sh
index 7a9deb9..99fc07f 100755
--- a/makefiles/lint/license/voltha-system-tests/license-check.sh
+++ b/makefiles/lint/license/voltha-system-tests/license-check.sh
@@ -37,9 +37,12 @@
## the only question mark.
## ---------------------------------------------------------------------------
+<<<<<<< HEAD
echo "BLAH"
exit 1
+=======
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
set +e -u -o pipefail
fail_licensecheck=0
@@ -54,17 +57,24 @@
while IFS= read -r -d '' path
do
+<<<<<<< HEAD
case "$path" in
*venv*) echo "GERR: $path"
exit 1
;;
esac
+=======
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
if ! grep -q "${gargs[@]}" "${path}";
then
echo "ERROR: $path does not contain License Header"
fail_licensecheck=1
fi
+<<<<<<< HEAD
done < <(find . \( -name ".git" -o -name '.venv' -o 'vst_venv' \) -prune -o -type f \
+=======
+done < <(find . -name ".git" -prune -o -type f \
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
! -iname "*.png" \
! -name "*.asc" \
! -name "*.bat" \
@@ -155,8 +165,13 @@
! -name "*.pb.h" \
! -name "*.pb.cc" \
! -path "*/docs/*" \
+<<<<<<< HEAD
! -name 'output.xml' \
! -path "*/vst_venv/*" \
+=======
+ ! -name 'output.xml' \
+ ! -path "*/.venv/*" \
+>>>>>>> dc6caae ([VOL-5064] - Build and deploy voltha-system-tests)
! -name '*#*' \
! -path '*scripts/flog/*' \
! -name '*~' \