Bulk disable node==qa-test-vm offline + makefile edits
jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
----------------------------------------------------
o Disable 4 jobs hanging on node==qa-test-vm.
config.mk
makefiles/lint/include.mk
-------------------------
o Refresh from repo:onf-make
o Pull in more lint targets (~doc8).
o Pull in per-repository configs to sync with config makefile v1.5
o See comment at [EOF] for details.
makefiles/virtualenv.mk
-----------------------
o Refresh target logic for pip install -r requirements.txt
o if exists install as a single block not as reliable as multiple statements.
Change-Id: I6199498f672abd8fdc59c20a757190cc897e7a5c
diff --git a/config.mk b/config.mk
index 399fbe7..3cec7fd 100644
--- a/config.mk
+++ b/config.mk
@@ -16,7 +16,7 @@
# -----------------------------------------------------------------------
# https://gerrit.opencord.org/plugins/gitiles/onf-make
# ONF.makefiles.include.version = 1.1
-# ONF.confg.mk = 1.1
+# ONF.confg.mk = 1.5
# -----------------------------------------------------------------------
--repo-name-- := ci-management
@@ -25,8 +25,8 @@
##--------------------------------##
##---] Disable lint targets [---##
##--------------------------------##
-# NO-LINT-DOC8 := true **
-# NO-LINT-GOLANG := true **
+# NO-LINT-DOC8 := true
+# NO-LINT-GOLANG := true
NO-LINT-GROOVY := true# # Note[1]
# NO-LINT-JJB := true# # Note[2]
# NO-LINT-JSON := true# # Note[1]
@@ -34,11 +34,12 @@
NO-LINT-REUSE := true # License check
NO-LINT-ROBOT := true
NO-LINT-SHELL := true# # Note[1]
+# NO-LINT-TOX := true# # Note[1]
NO-LINT-YAML := true# # Note[1]
+# NO-LINT-FLAKE8 := true# # Note[1]
NO-LINT-PYTHON := true# # Note[1]
# NO-LINT-PYLINT := true# # Note[1]
-# NO-LINT-TOX := true# # Note[1]
# Note[1] - A boatload of source to cleanup prior to enable.
# Note[2] - No sources available
@@ -75,6 +76,10 @@
onf-excl-dirs += patches# # voltha docs - python upgrade
onf-excl-dirs += .tox # also a python dependency
+ifeq ($(--repo-name--),voltha-docs)
+ lint-doc8-excl += '_build'
+endif
+
onf-excl-dirs ?= $(error onf-excl-dirs= is required)
##-----------------------------##
@@ -86,6 +91,9 @@
$(if $(filter %ci-management,$(--repo-name--)),\
$(eval --REPO-IS-CI-MANAGEMENT-- := true)\
)
+$(if $(filter %voltha-docs,$(--repo-name--)),\
+ $(eval --REPO-IS-VOLTHA-DOCS-- := true)\
+)
# create makefiles/config/byrepo/{--repo-name--}.mk for one-off snowflakes ?
# $(if $(wildcard docker),$(eval USE-ONF-DOCKER-MK := true))
@@ -101,6 +109,11 @@
onf-excl-dirs += packer
endif
+ifdef --REPO-IS-VOLTHA-DOCS--
+ onf-excl-dirs += _build
+ onf-excl-dirs += repos
+endif
+
ifdef NO-LINT-PYTHON
NO-LINT-FLAKE8 := true
NO-LINT-PYLINT := true
@@ -112,4 +125,16 @@
onf-excl-dirs := $(sort $(strip $(onf-excl-dirs)))
+# [TODO]#
+# --------------------------------------------------------------------
+# o two distinct makefiles/ directories are needed, one for onf-make
+# o second for repository specific makefile configs and logic.
+# o Two independent vars specify path:
+# ONF_MAKEDIR = library makefiles
+# MAKEDIR = repository specific content
+# o Conditional repository testing above can crush down all the
+# "if-this-repository-is-X-do-Y' logic above intoL
+# include $(MAKEDIR)/config.mk # repo:$(--repo-name--)
+# --------------------------------------------------------------------
+
# [EOF]