Adding a wait for containers condition

Change-Id: I4601b9f9e2f17ccfaaa1fcc6c24eaf9e13dd3b38
diff --git a/Makefile b/Makefile
index c4855cc..865c255 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,7 @@
 	@echo "utest        : Run all unit tests"
 	@echo
 
-build: protos docker-base
-#build: utest protos docker-base
+build: utest protos docker-base
 	docker build -t cord/voltha -f Dockerfile.voltha .
 	docker build -t cord/chameleon -f Dockerfile.chameleon .
 
@@ -132,7 +131,7 @@
 itest: venv
 	@ echo "Executing all integration tests"
 	. ${VENVDIR}/bin/activate && \
-	    nosetests tests/itests -s --exclude-dir=./tests/utests/
+	    nosetests tests/itests -s
 
 flake8: $(DIRS_FLAKE8)