Removing the downloaded libvirt-client for the iso build
[apex.git] / build / Makefile
index 226bc09..a829dc9 100644 (file)
@@ -8,60 +8,90 @@
 ##############################################################################
 
 export USE_MASTER = ""
-export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-DVD-1511.iso
-export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD))
+export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.4.1708/isos/x86_64/CentOS-7-x86_64-DVD-1708.iso
 export RELEASE = "0"
-export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso
+
+export RPM_DIST = $(shell rpm -E %dist)
+
+export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }')
+export NETVPP_REPO := $(shell awk -F\= '/^netvpp_repo/ {print $$2}' variables.sh )
+export NETVPP_BRANCH := $(shell awk -F\= '/^netvpp_branch/ {print $$2}' variables.sh )
+export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}')
+
+export RELRPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex-release.spec | head -n 1 | awk '{ print $$2 }')
 export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }')
-export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
-export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
-export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
-export RPMONO = $(shell pwd)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 
+export BUILD_ROOT = $(shell pwd)
+export BUILD_DIR = $(shell dirname $$(pwd))/.build
+export CACHE_DIR = $(shell dirname $$(pwd))/.cache
+export PATCHES_DIR = $(BUILD_ROOT)/patches
+export QUAGGA_BUILD_DIR = $(BUILD_DIR)/quagga_build_dir
+export QUAGGA_RPMS_DIR = $(QUAGGA_BUILD_DIR)/rpmbuild
+export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '_sourcedir $(BUILD_DIR)' -D '_rpmdir $(BUILD_DIR)' -D '_specdir $(BUILD_DIR)' -D '_srcrpmdir $(BUILD_DIR)'
+
+export RPMREL = $(BUILD_DIR)/noarch/opnfv-apex-release-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export RPMCOM = $(BUILD_DIR)/noarch/python34-opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export RPMUDR = $(BUILD_DIR)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export RPMODL = $(BUILD_DIR)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export RPMONO = $(BUILD_DIR)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
+export ISO = $(BUILD_DIR)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso
+export CENTISO = $(BUILD_DIR)/$(shell basename $(CENTDNLD))
 
 .PHONY: all
 all: iso
 
 .PHONY: clean
-clean: images-clean rpms-clean iso-clean tacker-clean tackerclient-clean congress-clean vpp-clean
+clean:
+       rm -rf $(BUILD_DIR)
 
-.PHONY: images
-images: undercloud overcloud-full overcloud-opendaylight overcloud-onos
+.PHONY: clean-cache
+clean-cache:
+       rm -rf $(CACHE_DIR)
 
-.PHONY: images-clean
-images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean
-       rm -rf images/
+.PHONY: images
+images: undercloud overcloud-full overcloud-opendaylight
 
 .PHONY: rpms
-rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm
+rpms: images common-rpm undercloud-rpm opendaylight-rpm
 
 .PHONY: rpms-check
-rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check
+rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check
 
 .PHONY: rpms-clean
-rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean
-       rm -rf noarch
+rpms-clean:
+       rm -rf $(BUILD_DIR)/noarch
+       rm -rf $(BUILD_DIR)/BUILDROOT
+
+$(BUILD_DIR)/opnfv-apex-release.tar.gz:
+       mkdir -p $(BUILD_DIR)
+       pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-release-$(RELRPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-release.tar.gz
+
+.PHONY: release-rpm-check
+release-rpm-check: $(BUILD_DIR)/opnfv-apex-release.tar.gz
+       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
+
+.PHONY: release-rpm
+release-rpm: $(BUILD_DIR)/opnfv-apex-release.tar.gz $(RPMREL)
 
-opnfv-apex-common.tar.gz:
-       pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz
+$(RPMREL):
+       @echo "Building the Apex Release RPM"
+       # build the release RPM
+       rpmbuild --clean -ba rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
+
+$(BUILD_DIR)/opnfv-apex-common.tar.gz:
+       pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-common.tar.gz
 
 .PHONY: common-rpm-check
-common-rpm-check: opnfv-apex-common.tar.gz
-       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+common-rpm-check: $(BUILD_DIR)/opnfv-apex-common.tar.gz
+       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: common-rpm
-common-rpm: opnfv-apex-common.tar.gz $(RPMCOM)
+common-rpm: $(BUILD_DIR)/opnfv-apex-common.tar.gz $(RPMCOM)
 
 $(RPMCOM):
        @echo "Building the Apex Common RPM"
        # build the common RPM
-       rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
-
-.PHONY: common-rpm-clean
-common-rpm-clean:
-       rm -rf opnfv-apex-common-$(RPMVERS)
-       rm -rf opnfv-apex-common.tar.gz
-
+       rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 ##################
 #  PYTHON TESTS  #
@@ -69,14 +99,7 @@ common-rpm-clean:
 
 .PHONY: python-tests
 python-tests:
-       # clean previous coverage data
-       rm -rf ../tests/.coverage
-       rm -rf ../tests/htmlcov
-       # run nose tests
-       cd ../tests && PYTHONPATH=../lib/python/ nosetests-3.4 . --with-coverage --cover-package apex --cover-package apex_python_utils --cover-html --cover-min-percentage 90
-
-       # generate reports
-       cd ../tests && coverage3 report --include '*lib/python/*' -m
+       tox -e py35
 
 #######################
 #  PYTHON PEP8 CHECK  #
@@ -84,188 +107,78 @@ python-tests:
 
 .PHONY: python-pep8-check
 python-pep8-check:
-       pep8 ../lib/python
-       pep8 ../tests
-
-###############
-#  TACKER     #
-###############
-
-.PHONY: tacker-clean
-
-tacker-clean:
-       rm -rf openstack-tacker-2015.2
-       rm -f openstack-tacker.tar.gz
-
-openstack-tacker.tar.gz:
-       @echo "Preparing the Tacker RPM prerequisites"
-       git clone http://github.com/trozet/tacker -b SFC_colorado openstack-tacker-2015.2
-       tar czf openstack-tacker.tar.gz openstack-tacker-2015.2
-
-.PHONY: tacker-rpm
-tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm
-
-openstack-tacker-2015.2-1.trozet.noarch.rpm:
-       @echo "Building the Tacker RPM"
-       rpmbuild --clean -bb --target noarch rpm_specs/openstack-tacker.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
-
-#################
-#  TACKERCLIENT #
-#################
-
-.PHONY: tackerclient-clean
-tackerclient-clean:
-       rm -rf python-tackerclient-2015.2
-       rm -f python-tackerclient.tar.gz
-
-python-tackerclient.tar.gz:
-       @echo "Preparing the TackerClient RPM prerequisites"
-       git clone http://github.com/trozet/python-tackerclient -b SFC_refactor python-tackerclient-2015.2
-       tar czf python-tackerclient.tar.gz python-tackerclient-2015.2
-
-.PHONY: tackerclient-rpm
-tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet.noarch.rpm
-
-python-tackerclient-2015.2-1.trozet.noarch.rpm:
-       @echo "Building the TackerClient RPM"
-       rpmbuild --clean -bb --target noarch rpm_specs/python-tackerclient.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
-
-###############
-#  CONGRESS   #
-###############
-
-.PHONY: congress-clean
+       tox -e pep8
 
-congress-clean:
-       @rm -rf openstack-congress-2016.1
-       @rm -f openstack-congress.tar.gz
+#############
+#  YAMLLINT #
+#############
 
-openstack-congress.tar.gz:
-       @echo "Preparing the Congress RPM prerequisites"
-       git clone http://github.com/openstack/congress -b stable/mitaka openstack-congress-2016.1
-       cd openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service
-       tar czf openstack-congress.tar.gz openstack-congress-2016.1
+.PHONY: yamllint
+yamllint:
+       @echo "Running yamllint against all .yaml files"
+       cd ../ && yamllint $(shell cd ../ && git ls-tree -r HEAD --name-only | grep 'yaml$$')
+#############
+#  RPMLINT  #
+#############
 
-.PHONY: congress-rpm
-congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm
+.PHONY: rpmlint
+rpmlint:
+       @echo "Running rpmlint against all RPM spec files"
+       rpmlint rpm_specs/*.spec
 
-openstack-congress-2016.1-1.noarch.rpm:
-       @echo "Building the Congress RPM"
-       rpmbuild --clean -bb --target noarch rpm_specs/openstack-congress.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
-
-###############
-#     VPP     #
-###############
+##################
+# NETWORKING-VPP #
+##################
 
-VPP_DIR = vpp
-MAVEN = apache-maven-3.3.9
-MAVEN_FILE = $(MAVEN)-bin.tar.gz
-
-.PHONY: vpp-clean
-vpp-clean:
-       @rm -f vpp-bin.tar.gz
-       @rm -rf vpp-bin vpp
-       @rm -rf honeycomb $(MAVEN) $(MAVEN_FILE) honeycomb-1.0.0-99.noarch.rpm
-       @rm -rf networking-vpp networking-vpp.noarch.rpm
-
-.PHONY: vpp-build
-vpp-build: vpp-bin.tar.gz
-
-vpp-bin.tar.gz: vpp honeycomb $(MAVEN)
-       $(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm
-       $(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install
-       pushd vpp/vpp-api/python && python setup.py bdist
-       pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-registry-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-registry -Dversion=16.12-SNAPSHOT -Dpackaging=jar
-       pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-core-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-core -Dversion=16.12-SNAPSHOT -Dpackaging=jar
-       pushd honeycomb && ../$(MAVEN)/bin/mvn clean install -DskipTests
-       pushd honeycomb/packaging/rpm/ && BUILD_NUMBER=99 ./rpmbuild.sh
-       mkdir vpp-bin
-       mv vpp/build-root/*.rpm vpp-bin/
-       mv honeycomb/packaging/rpm/RPMS/noarch/*.rpm .
-       mv vpp/vpp-api/python/dist/*.tar.gz vpp-bin/
-       tar czf vpp-bin.tar.gz vpp-bin
-
-vpp:
-       git clone https://gerrit.fd.io/r/vpp
-
-honeycomb:
-       git clone https://gerrit.fd.io/r/p/honeycomb.git
-
-$(MAVEN): $(MAVEN_FILE)
-       tar zxvf apache-maven-3.3.9-bin.tar.gz
-       cp mvn_settings.xml $(MAVEN)/conf/settings.xml
-
-$(MAVEN_FILE):
-       wget http://www.webhostingjams.com/mirror/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+$(BUILD_DIR)/python-networking-vpp.tar.gz:
+       @echo "Preparing the networking-vpp RPM prerequisites"
+       git clone $(NETVPP_REPO) -b $(NETVPP_BRANCH) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS)
+       tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS)
 
 .PHONY: networking-vpp-rpm
-networking-vpp-rpm: networking-vpp.noarch.rpm
-
-networking-vpp.noarch.rpm: networking-vpp
-       pushd networking-vpp && rpmbuild --clean -bb ../rpm_specs/networking-vpp.spec
-       mv networking-vpp/build/rpm/noarch/*.rpm networking-vpp.noarch.rpm
+networking-vpp-rpm: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm
 
-networking-vpp:
-       git clone https://git.openstack.org/openstack/networking-vpp
+$(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm: $(BUILD_DIR)/python-networking-vpp.tar.gz
+       @echo "Building the Networking VPP RPM"
+       rpmbuild --clean -ba --target noarch rpm_specs/networking-vpp.spec $(RPM_DIR_ARGS) -D 'git .git$(NETVPP_COMMIT)'
 
 ###############
 #  UNDERCLOUD #
 ###############
 
-.PHONY: undercloud-clean
-undercloud-clean:
-       rm -f images/undercloud.*
-       rm -rf opnfv-tht.tar.gz
-       rm -rf opnfv-tht/
-
 .PHONY: undercloud
-undercloud: images/undercloud.qcow2
+undercloud: $(BUILD_DIR)/undercloud.qcow2
 
-images/undercloud.qcow2: tackerclient-rpm
+$(BUILD_DIR)/undercloud.qcow2:
        @echo "Building the Apex Undercloud Image"
        @./undercloud.sh
 
-opnfv-apex-undercloud.tar.gz: images/undercloud.qcow2
+$(BUILD_DIR)/opnfv-apex-undercloud.tar.gz: $(BUILD_DIR)/undercloud.qcow2
        @echo "Preparing the Apex Undercloud RPM prerequisites"
-       pushd ../ && git archive --format=tar --prefix=opnfv-apex-undercloud-$(RPMVERS)/ HEAD > build/opnfv-apex-undercloud.tar
-       tar -rf opnfv-apex-undercloud.tar \
-               --xform="s:images/undercloud.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/undercloud.qcow2:" images/undercloud.qcow2
-       gzip -f opnfv-apex-undercloud.tar
+       pushd ../ && git archive --format=tar --prefix=opnfv-apex-undercloud-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-undercloud.tar
+       tar -rf $(BUILD_DIR)/opnfv-apex-undercloud.tar \
+               --xform="s:.*undercloud.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/undercloud.qcow2:" $(BUILD_DIR)/undercloud.qcow2
+       gzip -f $(BUILD_DIR)/opnfv-apex-undercloud.tar
 
 .PHONY: undercloud-rpm-check
-undercloud-rpm-check: opnfv-apex-undercloud.tar.gz
-       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+undercloud-rpm-check: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz
+       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: undercloud-rpm
-undercloud-rpm: opnfv-apex-undercloud.tar.gz $(RPMUDR)
+undercloud-rpm: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz $(RPMUDR)
 
 $(RPMUDR):
        @echo "Building the Apex Undercloud RPM"
-       rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
-
-.PHONY: undercloud-rpm-clean
-undercloud-rpm-clean:
-       rm -rf opnfv-apex-undercloud-$(RPMVERS)
-       rm -rf opnfv-apex-undercloud.tar.gz
-
+       rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 ###############
 #  OVERCLOUD  #
 ###############
 
-.PHONY: overcloud-full-clean
-overcloud-full-clean:
-       rm -rf images/overcloud-full.d
-       rm -f images/overcloud-full.*
-       rm -rf opnfv-puppet-tripleo.tar.gz
-       rm -rf opnfv-puppet-tripleo/
-       rm -rf os-net-config.tar.gz
-       rm -rf os-net-config/
-
 .PHONY: overcloud-full
-overcloud-full: images/overcloud-full.qcow2
+overcloud-full: $(BUILD_DIR)/overcloud-full.qcow2
 
-images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm
+$(BUILD_DIR)/overcloud-full.qcow2: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm
        @echo "Building the Apex Base Overcloud Image"
        @./overcloud-full.sh
 
@@ -273,75 +186,53 @@ images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm
 #    ODL      #
 ###############
 
-.PHONY: overcloud-opendaylight-clean
-overcloud-opendaylight-clean:
-       @rm -f images/overcloud-full-opendaylight.qcow2
-
 .PHONY: overcloud-opendaylight
-overcloud-opendaylight: images/overcloud-full-opendaylight.qcow2
+overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
 
-images/overcloud-full-opendaylight.qcow2: images/overcloud-full.qcow2
+$(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
        @echo "Building the Apex OpenDaylight Overcloud Image"
        @./overcloud-opendaylight.sh
 
-opnfv-apex.tar.gz: images/overcloud-full-opendaylight.qcow2
-       tar -czf opnfv-apex.tar.gz --xform="s:images/overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/images/overcloud-full-opendaylight.qcow2:" images/overcloud-full-opendaylight.qcow2
+$(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+       tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*/:opnfv-apex-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 $(BUILD_DIR)/overcloud-full.initrd $(BUILD_DIR)/overcloud-full.vmlinuz
 
 .PHONY: opendaylight-rpm-check
-opendaylight-rpm-check: opnfv-apex.tar.gz
-       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+opendaylight-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz
+       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: opendaylight-rpm
-opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL)
+opendaylight-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMODL)
 
 $(RPMODL):
        @echo "Building the Apex OpenDaylight RPM"
        # build the overcloud RPM
-       rpmbuild --clean -ba rpm_specs/opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
-
-.PHONY: opendaylight-rpm-clean
-opendaylight-rpm-clean:
-       rm -rf opnfv-apex-$(RPMVERS)
-       rm -rf opnfv-apex.tar.gz
-
+       rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 ###############
 #    ONOS     #
 ###############
 
-.PHONY: overcloud-onos-clean
-overcloud-onos-clean:
-       @rm -f images/overcloud-full-onos.qcow2
-       @rm -rf images/puppet-onos
-       @rm -f images/puppet-onos.tar.gz
-
 .PHONY: overcloud-onos
-overcloud-onos: images/overcloud-full-onos.qcow2
+overcloud-onos: $(BUILD_DIR)/overcloud-full-onos.qcow2
 
-images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2
+$(BUILD_DIR)/overcloud-full-onos.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
        @echo "Building the Apex ONOS Overcloud Image"
        @./overcloud-onos.sh
 
-.PHONY: onos-rpm-clean
-onos-rpm-clean:
-       @#rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
-       rm -rf opnfv-apex-onos-$(RPMVERS)
-       rm -rf opnfv-apex-onos.tar.gz
-
-opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2
-       tar -czf opnfv-apex-onos.tar.gz --xform="s:images/overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/images/overcloud-full-onos.qcow2:" images/overcloud-full-onos.qcow2
+$(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2
+       tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*/:opnfv-apex-onos-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-onos.qcow2
 
 .PHONY: onos-rpm-check
-onos-rpm-check: opnfv-apex-onos.tar.gz
-       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+onos-rpm-check: $(BUILD_DIR)/opnfv-apex-onos.tar.gz
+       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 .PHONY: onos-rpm
-onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO)
+onos-rpm: $(BUILD_DIR)/opnfv-apex-onos.tar.gz $(RPMONO)
 
 $(RPMONO):
        @echo "Building the Apex ONOS RPM"
        # build the overcloud RPM
-       rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+       rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')"
 
 ###############
 #    ISO      #
@@ -350,10 +241,9 @@ $(RPMONO):
 $(CENTISO):
        curl $(CENTDNLD) -z $(CENTISO) -o $(CENTISO) --verbose --silent --location
 
-.PHONY: iso-clean
 iso-clean:
-       @rm -Rf centos
-       @rm -Rf release
+       @rm -Rf $(BUILD_DIR)/centos
+       @rm -Rf $(BUILD_DIR)/release
        @rm -f $(ISO)
 
 .PHONY: mount-centiso umount-centiso
@@ -372,72 +262,90 @@ umount-centiso:
 .PHONY: iso
 iso:   iso-clean images rpms $(CENTISO)
        @echo "Building the Apex ISO"
-       @mkdir centos release
-       cd centos && bsdtar -xf ../$(shell basename $(CENTISO))
+       @mkdir $(BUILD_DIR)/centos $(BUILD_DIR)/release
+       cd $(BUILD_DIR)/centos && bsdtar -xf ../$(shell basename $(CENTISO))
        # modify the installer iso's contents
-       @chmod -R u+w centos
-       @cp -f isolinux.cfg centos/isolinux/isolinux.cfg
-       @ln $(RPMCOM) centos/Packages
-       @ln $(RPMUDR) centos/Packages
-       @ln $(RPMODL) centos/Packages
-       @ln $(RPMONO) centos/Packages
+       @chmod -R u+w $(BUILD_DIR)/centos
+       @cp -f isolinux.cfg $(BUILD_DIR)/centos/isolinux/isolinux.cfg
+       @ln $(RPMCOM) $(BUILD_DIR)/centos/Packages
+       @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages
+       @ln $(RPMODL) $(BUILD_DIR)/centos/Packages
        # add packages to the centos packages
-       cd centos/Packages && yumdownloader openvswitch
-       cd centos/Packages && yumdownloader openstack-tripleo
-       cd centos/Packages && yumdownloader jq
-       cd centos/Packages && yumdownloader python34
-       cd centos/Packages && yumdownloader python34-libs
-       cd centos/Packages && yumdownloader python34-yaml
-       cd centos/Packages && yumdownloader python34-setuptools
-       cd centos/Packages && yumdownloader ipxe-roms-qemu
-       cd centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm
-       cd centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm
-       cd centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply
+       cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-python python-lxml python-passlib
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-iptables-0.12.0-1.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-libvirt-3.6.0-1.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pbr-3.1.1-1.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-PrettyTable-0.7.2-1.el7.centos.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pycrypto-2.6.1-1.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pyghmi-1.0.22-1.el7.centos.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-virtualbmc-1.2.0-1.el7.centos.noarch.rpm
        # regenerate yum repo data
        @echo "Generating new yum metadata"
-       createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos
+       createrepo --update -g $(BUILD_ROOT)/c7-opnfv-x86_64-comps.xml $(BUILD_DIR)/centos
        # build the iso
        @echo "Building OPNFV iso"
-       mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -V "OPNFV CentOS 7 x86_64" -R -J -v -T -o $(ISO) centos
+       mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -V "OPNFV CentOS 7 x86_64" -R -J -v -T -o $(ISO) $(BUILD_DIR)/centos
        isohybrid $(ISO)
        @printf "\n\nISO is built at $(ISO)\n\n"
 
-####################
-#  python3-jinja2  #
-####################
-
-.PHONY: python3-jinja2
-python3-jinja2: python3-markupsafe python-jinja2-2.8-5.fc24.src.rpm
-       curl -O http://ftp.linux.ncsu.edu/pub/fedora/linux//development/24/Everything/source/tree/Packages/p/python-jinja2-2.8-5.fc24.src.rpm
-       rpm2cpio python-jinja2-2.8-5.fc24.src.rpm | cpio -idmv
-       sed -i 's/python3-devel/python34-devel/' python-jinja2.spec
-       sed -i 's/python3-setuptools/python34-setuptools/' python-jinja2.spec
-       sed -i 's/python3-pytest/python34-pytest/' python-jinja2.spec
-       sed -i 's/python3-markupsafe/python34-markupsafe/' python-jinja2.spec
-       rpmbuild -ba python-jinja2.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "with_python3 1"
-
-.PHONY: python3-jinja2-clean
-python3-jinja2-clean:
-       rm -f python-jinja2-2.8-5.fc24.src.rpm
-       rm -f python-jinja2.spec
-       rm -f Jinja2-2.8.tar.gz
-
-########################
-#  python3-markupsafe  #
-########################
-
-.PHONY: python3-markupsafe
-python3-markupsafe: python-markupsafe-0.23-9.fc24.src.rpm
-       curl -O http://ftp.linux.ncsu.edu/pub/fedora/linux//development/24/Everything/source/tree/Packages/p/python-markupsafe-0.23-9.fc24.src.rpm
-       rpm2cpio python-markupsafe-0.23-9.fc24.src.rpm | cpio -idmv
-       sed -i 's/python3-devel/python34-devel/' python-markupsafe.spec
-       sed -i 's/python3-setuptools/python34-setuptools/' python-markupsafe.spec
-       sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec
-       sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec
-       rpmbuild -ba python-markupsafe.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "with_python3 1"
-
-.PHONY: python3-markupsafe-clean
-python3-markupsafe-clean:
-       rm -f python-markupsafe-0.23-9.fc24.src.rpm
-       rm -f python-markupsafe.spec
-       rm -f MarkupSafe-0.23.tar.gz
+##################
+#  Quagga Clean  #
+##################
+.PHONY: quagga-clean
+quagga-clean:
+       @rm -rf $(QUAGGA_BUILD_DIR)
+       @sudo yum -y remove zrpc* quagga* c-capnproto* thrift*
+
+#################
+#  Quagga+ZRPC  #
+#################
+.PHONY: quagga-zrpc
+quagga-zrpc: quagga-clean thrift-rpm capnproto-rpm quagga-rpm zrpc-rpm
+
+##########
+#  ZRPC  #
+##########
+.PHONY: zrpc-rpm
+zrpc-rpm: quagga-rpm $(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm
+
+$(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm:
+       @echo "Building ZRPC RPM"
+       @./build_quagga.sh -a zrpc
+
+############
+#  Quagga  #
+############
+.PHONY: quagga-rpm
+quagga-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm
+
+$(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm:
+       @echo "Building Quagga RPM"
+       @./build_quagga.sh -a quagga
+
+###############
+#  Capnproto  #
+###############
+.PHONY: capnproto-rpm
+capnproto-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm
+
+$(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm:
+       @echo "Building capnproto RPMs"
+       @./build_quagga.sh -a capnproto
+
+############
+#  Thrift  #
+############
+
+.PHONY: thrift-rpm
+thrift-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm
+
+$(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm:
+       @echo "Building Thrift RPMs"
+       @./build_quagga.sh -a thrift