VOL-1619: Update to support a single Makefile
Mimics work done here: https://gerrit.opencord.org/#/c/14001/
Change-Id: Ia5f3cf612f082b01f4ac517421618d87eb278f47
diff --git a/Makefile b/Makefile
index 37099be..e97238c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,9 @@
DOCKER_REPOSITORY ?=
DOCKER_BUILD_ARGS ?=
DOCKER_TAG ?= ${VERSION}
-ADAPTER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter-go:${DOCKER_TAG}
+GOADAPTER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}-go
+PYTHONADAPTER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}-py
+ADAPTER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}
## Docker labels. Only set ref and commit date if committed
DOCKER_LABEL_VCS_URL ?= $(shell git remote get-url $(shell git remote))
@@ -38,14 +40,16 @@
DOCKER_LABEL_VCS_REF = $(shell git rev-parse HEAD)+dirty
endif
-.PHONY: docker-build local-protos local-volthago
+.PHONY: docker-build openolt_go openolt_python local-protos local-volthago local-pyvoltha
# This should to be the first and default target in this Makefile
help:
@echo "Usage: make [<target>]"
@echo "where available targets are:"
@echo
- @echo "build : Build the openolt adapter docker image"
+ @echo "build : Build both openolt adapter docker images"
+ @echo "openolt_go : Build Golang openolt adapter docker image"
+ @echo "openolt_python : Build Python openolt adapter docker image"
@echo "help : Print this help"
@echo "docker-push : Push the docker images to an external repository"
@echo "lint : Run lint verification, depenancy, gofmt and reference check"
@@ -53,14 +57,22 @@
@echo
-## Docker targets
-
-build: docker-build
+## Local Development Helpers
local-protos:
+ mkdir -p python/local_imports
ifdef LOCAL_PROTOS
mkdir -p vendor/github.com/opencord/voltha-protos/go
- cp -rf ${GOPATH}/src/github.com/opencord/voltha-protos/go/ vendor/github.com/opencord/voltha-protos
+ cp -r ${GOPATH}/src/github.com/opencord/voltha-protos/go/* vendor/github.com/opencord/voltha-protos/go
+ mkdir -p python/local_imports/voltha-protos/dist
+ cp ../voltha-protos/dist/*.tar.gz python/local_imports/voltha-protos/dist/
+endif
+
+local-pyvoltha:
+ mkdir -p python/local_imports
+ifdef LOCAL_PYVOLTHA
+ mkdir -p python/local_imports/pyvoltha/dist
+ cp ../pyvoltha/dist/*.tar.gz python/local_imports/pyvoltha/dist/
endif
local-volthago:
@@ -70,9 +82,36 @@
rm -rf vendor/github.com/opencord/voltha-go/vendor
endif
-docker-build: local-protos local-volthago
+
+## Python venv dev environment
+
+VENVDIR := python/venv-openolt
+
+venv: distclean local-protos local-pyvoltha
+ virtualenv ${VENVDIR};\
+ source ./${VENVDIR}/bin/activate ; set -u ;\
+ rm ${VENVDIR}/local/bin ${VENVDIR}/local/lib ${VENVDIR}/local/include ;\
+ pip install -r python/requirements.txt
+
+ifdef LOCAL_PYVOLTHA
+ source ./${VENVDIR}/bin/activate ; set -u ;\
+ pip install python/local_imports/pyvoltha/dist/*.tar.gz
+endif
+ifdef LOCAL_PROTOS
+ source ./${VENVDIR}/bin/activate ; set -u ;\
+ pip install python/local_imports/voltha-protos/dist/*.tar.gz
+endif
+
+
+## Docker targets
+
+build: docker-build
+
+docker-build: openolt_go openolt_python
+
+openolt_go: local-protos local-volthago
docker build $(DOCKER_BUILD_ARGS) \
- -t ${ADAPTER_IMAGENAME} \
+ -t ${GOADAPTER_IMAGENAME} \
--build-arg org_label_schema_version="${VERSION}" \
--build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \
--build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
@@ -80,7 +119,24 @@
--build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
-f docker/Dockerfile.openolt .
+openolt_python: local-protos local-pyvoltha
+ docker build $(DOCKER_BUILD_ARGS) \
+ -t ${PYTHONADAPTER_IMAGENAME} \
+ --build-arg LOCAL_PYVOLTHA=$(LOCAL_PYVOLTHA) \
+ --build-arg LOCAL_PROTOS=$(LOCAL_PROTOS) \
+ --build-arg org_label_schema_version="${VERSION}" \
+ --build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \
+ --build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
+ --build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
+ --build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
+ -f python/docker/Dockerfile.openolt_adapter python
+
+ # Current default image gets the base DOCKER_TAG
+ docker tag ${PYTHONADAPTER_IMAGENAME} ${ADAPTER_IMAGENAME}
+
docker-push:
+ docker push ${GOADAPTER_IMAGENAME}
+ docker push ${PYTHONADAPTER_IMAGENAME}
docker push ${ADAPTER_IMAGENAME}
@@ -132,4 +188,11 @@
$(GOCOVER_COBERTURA) < ./tests/results/go-test-coverage.out > ./tests/results/go-test-coverage.xml ;\
exit $$RETURN
+clean:
+ rm -rf python/local_imports
+ find python -name '*.pyc' | xargs rm -f
+
+distclean: clean
+ rm -rf ${VENVDIR}
+
# end file
diff --git a/python/Makefile b/python/Makefile
deleted file mode 100644
index 9c81ed0..0000000
--- a/python/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright 2018 the original author or authors.
-#
-# 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.
-#
-
-# set default shell
-SHELL = bash -e -o pipefail
-
-# Variables
-VERSION ?= $(shell cat ../VERSION)
-
-## Docker related
-DOCKER_REGISTRY ?=
-DOCKER_REPOSITORY ?=
-DOCKER_BUILD_ARGS ?=
-DOCKER_TAG ?= ${VERSION}
-ADAPTER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}
-
-## Docker labels. Only set ref and commit date if committed
-DOCKER_LABEL_VCS_URL ?= $(shell git remote get-url $(shell git remote))
-DOCKER_LABEL_BUILD_DATE ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
-DOCKER_LABEL_COMMIT_DATE = $(shell git show -s --format=%cd --date=iso-strict HEAD)
-
-ifeq ($(shell git ls-files --others --modified --exclude-standard 2>/dev/null | wc -l | sed -e 's/ //g'),0)
- DOCKER_LABEL_VCS_REF = $(shell git rev-parse HEAD)
-else
- DOCKER_LABEL_VCS_REF = $(shell git rev-parse HEAD)+dirty
-endif
-
-.PHONY: venv docker-build local-protos local-pyvoltha
-
-# This should to be the first and default target in this Makefile
-help:
- @echo "Usage: make [<target>]"
- @echo "where available targets are:"
- @echo
- @echo "build : Build the openolt adapter docker image"
- @echo "help : Print this help"
- @echo "docker-push : Push the docker images to an external repository"
- @echo "venv : Build local Python virtualenv"
- @echo "clean : Remove files created by the build and tests"
- @echo "distclean : Remove venv directory"
- @echo
-
-
-## Docker targets
-
-build: docker-build
-
-local-protos:
- mkdir -p local_imports
-ifdef LOCAL_PROTOS
- mkdir -p local_imports/voltha-protos/dist
- cp ../../voltha-protos/dist/*.tar.gz local_imports/voltha-protos/dist/
-endif
-
-local-pyvoltha:
- mkdir -p local_imports
-ifdef LOCAL_PYVOLTHA
- mkdir -p local_imports/pyvoltha/dist
- cp ../../pyvoltha/dist/*.tar.gz local_imports/pyvoltha/dist/
-endif
-
-docker-build: local-protos local-pyvoltha
- docker build $(DOCKER_BUILD_ARGS) \
- -t ${ADAPTER_IMAGENAME} \
- --build-arg LOCAL_PYVOLTHA=$(LOCAL_PYVOLTHA) \
- --build-arg LOCAL_PROTOS=$(LOCAL_PROTOS) \
- --build-arg org_label_schema_version="${VERSION}" \
- --build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \
- --build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
- --build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
- --build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
- -f docker/Dockerfile.openolt_adapter .
-
-docker-push:
- docker push ${ADAPTER_IMAGENAME}
-
-
-## Python venv dev environment
-
-VENVDIR := venv-openolt
-
-venv: distclean local-protos local-pyvoltha
- virtualenv ${VENVDIR};\
- source ./${VENVDIR}/bin/activate ; set -u ;\
- rm ${VENVDIR}/local/bin ${VENVDIR}/local/lib ${VENVDIR}/local/include ;\
- pip install -r requirements.txt
-
-ifdef LOCAL_PYVOLTHA
- source ./${VENVDIR}/bin/activate ; set -u ;\
- pip install local_imports/pyvoltha/dist/*.tar.gz
-endif
-ifdef LOCAL_PROTOS
- source ./${VENVDIR}/bin/activate ; set -u ;\
- pip install local_imports/voltha-protos/dist/*.tar.gz
-endif
-
-clean:
- rm -rf local_imports
- find . -name '*.pyc' | xargs rm -f
-
-distclean: clean
- rm -rf ${VENVDIR}
-
-# end file