Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build was broken, because Makefile still had chameleon references. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Build was broken, because Makefile still had chameleon references. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions Makefile
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include setup.mk

VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')

.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos
.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha ofagent podder netconf shovel onos

default: build

Expand Down Expand Up @@ -76,20 +76,14 @@ help:

build: protos containers

containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester
containers: docker-base voltha ofagent podder netconf shovel onos tester

docker-base:
docker build -t cord/voltha-base -f docker/Dockerfile.base .

voltha:
docker build -t cord/voltha -f docker/Dockerfile.voltha .

chameleon:
mkdir tmp.chameleon
cp -R chameleon/* tmp.chameleon
docker build -t cord/chameleon -f docker/Dockerfile.chameleon .
rm -rf tmp.chameleon

ofagent:
docker build -t cord/ofagent -f docker/Dockerfile.ofagent .

Expand All @@ -110,7 +104,6 @@ tester:

protos:
make -C voltha/protos
make -C chameleon/protos
make -C ofagent/protos
make -C netconf/protos

Expand Down Expand Up @@ -165,7 +158,7 @@ utest-with-coverage: venv protos
@ echo "Executing all unit tests and producing coverage results"
. ${VENVDIR}/bin/activate && \
for d in $$(find ./tests/utests -depth -type d); do echo $$d:; \
nosetests --with-xcoverage --with-xunit --cover-package=voltha,common,ofagent,chameleon $$d; done
nosetests --with-xcoverage --with-xunit --cover-package=voltha,common,ofagent $$d; done

itest: venv run-as-root-tests
@ echo "Executing all integration tests"
Expand Down