VOL-4917 - voltha-go build and test problems.
Makefile
makefiles/
==========
o Update copyright notice.
o Added a few common makefile libraries.
o Added todo.mk to document a few future-fix items.
o Added versions.mk used to display build tools and versions.
o Added comments and banners to delimit logic and identify log output.
o Fixed coverage target, git test -coverprofile requires a disk file.
o Strange: 'go mod vendor' will remove vendor/ but the directory is
under revision control. [TODO] Delete or checkout from a central repo.
o Split long lines with line continuation at shell pipe.
o Replace inlined rm -rf calls with make builtin $(RM) -r
o Refacor test log names into macros to shorten logic line length.
docker/Dockerfile.rw_core
-------------------------
o Update copyright notice.
o Inline --no-cache with apk calls, networking problems surfaced while
running "make build/test" while disconnected from the VPN.
o Copy stub go-test-coverage.out file to the docker image, go test
-coverprofile was failing w/o a file on disk.
o Testing reported a "could not create cpu profile" error. Create a pull
request for feedback to see if this is a lingering coverage problem or
my laptop cpu is unknown and contributing.
Change-Id: I84724682cfd9dbcd08990cef382338f005261184
diff --git a/Makefile b/Makefile
index a977331..1b07af8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-#
-# Copyright 2016 the original author or authors.
-#
+# -*- makefile -*-
+# -----------------------------------------------------------------------#
+# Copyright 2016-2023 Open Networking Foundation (ONF) and the ONF Contributors
+
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -12,10 +13,19 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+# -----------------------------------------------------------------------
-# set default shell
-SHELL = bash -e -o pipefail
+.DEFAULT_GOAL := help
+
+TOP ?= .
+MAKEDIR ?= $(TOP)/makefiles
+
+$(if $(VERBOSE),$(eval export VERBOSE=$(VERBOSE))) # visible to include(s)
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+include $(MAKEDIR)/include.mk
# Variables
VERSION ?= $(shell cat ./VERSION)
@@ -27,6 +37,7 @@
ifneq ($(shell git ls-files --others --modified --exclude-standard 2>/dev/null | wc -l | sed -e 's/ //g'),0)
DOCKER_LABEL_VCS_DIRTY = true
endif
+
## Docker related
DOCKER_EXTRA_ARGS ?=
DOCKER_REGISTRY ?=
@@ -83,11 +94,22 @@
cp -r ${LOCAL_LIB_GO}/pkg/* vendor/github.com/opencord/voltha-lib-go/v7/pkg/
endif
+## -----------------------------------------------------------------------
## Docker targets
+## -----------------------------------------------------------------------
build: docker-build ## Alias for 'docker-build'
+docker-build-args += --debug
+docker-build-args += --log-level 'debug'
+docker-build-args := $(null)# comment line for debug mode
+
docker-build: local-protos local-lib-go ## Build core docker image (set BUILD_PROFILED=true to also build the profiled image)
- docker build $(DOCKER_BUILD_ARGS) -t ${RWCORE_IMAGENAME}:${DOCKER_TAG} --target ${DOCKER_TARGET} -f docker/Dockerfile.rw_core .
+ @echo "======================================================================="
+ @echo " ** TARGET: $@"
+ @echo "======================================================================="
+ $(MAKE) --no-print-directory init-test-results
+
+ docker $(docker-build-args) build $(DOCKER_BUILD_ARGS) -t ${RWCORE_IMAGENAME}:${DOCKER_TAG} --target ${DOCKER_TARGET} -f docker/Dockerfile.rw_core .
ifdef BUILD_PROFILED
# Force target to dev as profile build must be built with dynamic linking
docker build $(DOCKER_BUILD_ARGS) --target dev --build-arg EXTRA_GO_BUILD_TAGS="-tags profile" --build-arg CGO_PARAMETER="CGO_ENABLED=1" -t ${RWCORE_IMAGENAME}:${DOCKER_TAG}-profile -f docker/Dockerfile.rw_core .
@@ -97,6 +119,8 @@
docker build $(DOCKER_BUILD_ARGS) --target dev --build-arg GOLANG_IMAGE=golang:1.13.8-buster --build-arg CGO_PARAMETER="CGO_ENABLED=1" --build-arg DEPLOY_IMAGE=debian:buster-slim --build-arg EXTRA_GO_BUILD_TAGS="--race" -t ${RWCORE_IMAGENAME}:${DOCKER_TAG}-rd -f docker/Dockerfile.rw_core .
endif
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
docker-push: ## Push the docker images to an external repository
docker push ${RWCORE_IMAGENAME}:${DOCKER_TAG}
ifdef BUILD_PROFILED
@@ -124,35 +148,45 @@
@git diff-index --quiet HEAD -- go.mod go.sum vendor || (echo "ERROR: Staged or modified files must be committed before running this test" && git status -- go.mod go.sum vendor && exit 1)
@[[ `git ls-files --exclude-standard --others go.mod go.sum vendor` == "" ]] || (echo "ERROR: Untracked files must be cleaned up before running this test" && git status -- go.mod go.sum vendor && exit 1)
${GO} mod tidy
+
+ # This command is destructive, vendor/ removed
${GO} mod vendor
+
@git status > /dev/null
@git diff-index --quiet HEAD -- go.mod go.sum vendor || (echo "ERROR: Modified files detected after running go mod tidy / go mod vendor" && git status -- go.mod go.sum vendor && git checkout -- go.mod go.sum vendor && exit 1)
@[[ `git ls-files --exclude-standard --others go.mod go.sum vendor` == "" ]] || (echo "ERROR: Untracked files detected after running go mod tidy / go mod vendor" && git status -- go.mod go.sum vendor && git checkout -- go.mod go.sum vendor && exit 1)
@echo "Vendor check OK."
-
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
lint: lint-mod lint-dockerfile ## Run all lint targets
sca: ## Runs static code analysis with the golangci-lint tool
- @rm -rf ./sca-report
+ @$(RM) -r ./sca-report
@mkdir -p ./sca-report
@echo "Running static code analysis..."
- @${GOLANGCI_LINT} run --deadline=6m --out-format junit-xml ./... | tee ./sca-report/sca-report.xml
+ @${GOLANGCI_LINT} run --deadline=6m --out-format junit-xml ./... \
+ | tee ./sca-report/sca-report.xml
@echo ""
@echo "Static code analysis OK"
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+tests-dir := ./tests/results
+tests-coverage := $(tests-dir)/go-test-coverage
+tests-results := $(tests-dir)/go-test-results
test: local-lib-go ## Run unit tests
- @mkdir -p ./tests/results
- @${GO} test -mod=vendor -v -coverprofile ./tests/results/go-test-coverage.out -covermode count ./... 2>&1 | tee ./tests/results/go-test-results.out ;\
+ $(MAKE) --no-print-directory init-test-results
+ $(HIDE)${GO} test -mod=vendor -v -coverprofile $(tests-coverage).out -covermode count ./... 2>&1 | tee $(tests-results).out ;\
RETURN=$$? ;\
- ${GO_JUNIT_REPORT} < ./tests/results/go-test-results.out > ./tests/results/go-test-results.xml ;\
- ${GOCOVER_COBERTURA} < ./tests/results/go-test-coverage.out > ./tests/results/go-test-coverage.xml ;\
+ ${GO_JUNIT_REPORT} < $(tests-results).out > $(tests-results).xml ;\
+ ${GOCOVER_COBERTURA} < $(tests-coverage).out > $(tests-coverage).xml ;\
exit $$RETURN
clean: distclean ## Removes any local filesystem artifacts generated by a build
-distclean: ## Removes any local filesystem artifacts generated by a build or test run
- rm -rf ./sca-report
+distclean sterile: ## Removes any local filesystem artifacts generated by a build or test run
+ $(RM) -r ./sca-report
mod-update: ## Update go mod files
${GO} mod tidy
@@ -161,10 +195,29 @@
fmt: ## Formats the soure code to go best practice style
@go fmt ${PACKAGES}
+## ---------------------------------------------------------------------------
+## Intent: Prep work, test -coverprofile fails w/o a file on disk ?!?
+## ---------------------------------------------------------------------------
+init-test-results:
+ @$(RM) -r tests/results
+ @mkdir -p tests/results
+ @touch $(tests-coverage).out
+
+## ---------------------------------------------------------------------------
# For each makefile target, add ## <description> on the target line and it will be listed by 'make help'
+## ---------------------------------------------------------------------------
help: ## Print help for each Makefile target
@echo "Usage: make [<target>]"
- @echo "where available targets are:"
+ @echo " help This message"
+ @echo " todo Future enhancements"
+ @echo " versions Display version-by-tool used while building"
+ ifdef VERBOSE
@echo
- @grep '^[[:alpha:]_-]*:.* ##' $(MAKEFILE_LIST) \
- | sort | awk 'BEGIN {FS=":.* ## "}; {printf "%-25s : %s\n", $$1, $$2};'
+ @echo " init-test-results Massage tests/results to fix coverage reporting"
+ endif
+ @echo
+ @grep --no-filename '^[[:alpha:]_-]*:.* ##' $(MAKEFILE_LIST) \
+ | sort \
+ | awk 'BEGIN {FS=":.* ## "}; {printf "%-25s : %s\n", $$1, $$2};'
+
+# [EOF]
diff --git a/VERSION b/VERSION
index 9cec716..23887f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.6
+3.1.7
diff --git a/docker/Dockerfile.rw_core b/docker/Dockerfile.rw_core
index b8698e4..94c24ba 100644
--- a/docker/Dockerfile.rw_core
+++ b/docker/Dockerfile.rw_core
@@ -1,4 +1,6 @@
-# Copyright 2016 the original author or authors.
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2016-2023 Open Networking Foundation (ONF) and the ONF Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,14 +13,32 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+# -----------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
+# Alternates to try when APK is having repository problems.
+# http://dl-cnd.alpinelinux.org
+# http://dl-3.alpinelinux.org
+# http://dl-4.alpinelinux.org
+# ---------------------------------------------------------------------------
+#9 0.263 fetch https://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKIND4EX.tar.gz
+#9 5.269 ERROR: https://dl-cdn.alpinelinux.org/alpine/v3.13/main: temporary error (try again later)
+#9 5.269 WARNING: Ignoring https://dl-cdn.alpinelinux.org/alpine/v3.13/main: No such file or directory
+#9 5.269 fetch https://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz
+# ---------------------------------------------------------------------------
# -------------
# Build stage
FROM --platform=linux/amd64 golang:1.16.3-alpine3.13 AS dev
+# [TODO] update
+# FROM --platform=linux/amd64 golang:1.19.4-r0-alpine3.17 AS dev
+
# Install required packages
-RUN apk add --no-cache build-base=0.5-r3
+
+RUN apk --update update # refresh the index
+RUN apk --update add --no-cache build-base=0.5-r3
# Use Standard go build directory structure
WORKDIR /go/src
@@ -27,6 +47,9 @@
COPY db ./db
COPY vendor ./vendor
+# go test -coverprofile fails w/o this.
+COPY tests/results/go-test-coverage.out ./tests/results/go-test-coverage.out
+
# Copy files
COPY rw_core ./rw_core
COPY go.mod ./
diff --git a/makefiles/consts.mk b/makefiles/consts.mk
new file mode 100644
index 0000000..c34d119
--- /dev/null
+++ b/makefiles/consts.mk
@@ -0,0 +1,28 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022 Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+
+null :=#
+space :=$(null) $(null)
+dot :=.
+HIDE ?=@
+
+# use bash for pusdh/popd and quick failures.
+# virtual env(s) activate has undefined vars so no -u
+# ^---+ verify this is still true
+export SHELL := bash -e -o pipefail
+
+# [EOF]
diff --git a/makefiles/include.mk b/makefiles/include.mk
new file mode 100644
index 0000000..c51e7ee
--- /dev/null
+++ b/makefiles/include.mk
@@ -0,0 +1,28 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+include $(MAKEDIR)/consts.mk
+include $(MAKEDIR)/todo.mk
+include $(MAKEDIR)/versions.mk
+
+# [EOF]
diff --git a/makefiles/todo.mk b/makefiles/todo.mk
new file mode 100644
index 0000000..9342690
--- /dev/null
+++ b/makefiles/todo.mk
@@ -0,0 +1,32 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+todo ::
+ @echo " o vendor/ is maintained by conflicting logic:"
+ @echo " - contents is checked into revision control (~duplication)."
+ @echo " - make targets rm -fr vendor/."
+ @echo " - Delete subdir and checkout from a central source as dependency."
+ @echo " o make test target not creating coverage log:"
+ @echo " - go test -coverprofile >> ./tests/results/go-test-coverage.out"
+ @echo " - open /app/tests/results/go-test-coverage.out: permission denied"
+ @echo " o make test failure"
+ @echo " - level:fatal, msg:could not create CPU profile: open grpc_profile.cpu: permission denied"
+
+# [EOF]
diff --git a/makefiles/versions.mk b/makefiles/versions.mk
new file mode 100644
index 0000000..ffa090e
--- /dev/null
+++ b/makefiles/versions.mk
@@ -0,0 +1,30 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+versions ::
+ lsb_release --release
+
+ @docker --version
+ @docker-compose --version
+
+ @python --version
+ @go version
+
+# [EOF]
diff --git a/rw_core/core/adapter/common.go b/rw_core/core/adapter/common.go
index 354ccc9..93b762e 100644
--- a/rw_core/core/adapter/common.go
+++ b/rw_core/core/adapter/common.go
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-present Open Networking Foundation
+ * Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/rw_core/core/device/manager_nbi.go b/rw_core/core/device/manager_nbi.go
index 8b3848d..08062bd 100644
--- a/rw_core/core/device/manager_nbi.go
+++ b/rw_core/core/device/manager_nbi.go
@@ -1,5 +1,5 @@
/*
- * Copyright 2021-present Open Networking Foundation
+ * Copyright 2021-2023 Open Networking Foundation (ONF) and the ONF Contributors
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.