Merge "Removing sdn_l3 and _l2 scenario features"
[apex.git] / build / Makefile
index c2ceea9..1d329fb 100644 (file)
@@ -1,7 +1,5 @@
 ##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
+# Copyright (c) 2016 Red Hat Inc.
 # dradez@redhat.com
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-SHELL = /bin/bash
-############################################################################
-# BEGIN of variables to customize
-#
-#Input args
-export UNIT_TEST = FALSE
 export USE_MASTER = ""
-export INTERACTIVE = TRUE
-export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.1.1503/isos/x86_64/CentOS-7-x86_64-DVD-1503-01.iso
-export ISOSRC = file:$(shell pwd)/CentOS-7-x86_64-DVD-1503-01.iso
-export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
-export PRODNO = "OPNFV_BGS"
-export REVSTATE = "0000"
-export NEWISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${REVSTATE}.iso
-export APEXRPM = $(shell pwd)/noarch/opnfv-apex-2.0-$(shell echo ${REVSTATE} | tr -d '_-').noarch.rpm
+export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.3.1611/isos/x86_64/CentOS-7-x86_64-DVD-1611.iso
+export RELEASE = "0"
 
-# Note! Invoke with "make REVSTATE=RXXXX all" to make release build!
-# Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location.
+export RPM_DIST = $(shell rpm -E %dist)
 
-#Build variables
-export BUILD_BASE := $(shell pwd)
-export CACHE_DIR := $(BUILD_BASE)/cache
-export VERSION_FILE := $(BUILD_BASE)/.versions
-export TOPDIR := $(shell pwd)
+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)}')
 
-CENTDIR := $(TOPDIR)/centiso
-#
-# END of variables to customize
-#############################################################################
+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 }')
 
-SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
+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/opnfv-apex-common-$(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
-       @echo "Versions of cached build results built by" $(shell hostname) "at" $(shell date -u) > $(VERSION_FILE)
-       @echo "cache.mk" $(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ") >> $(VERSION_FILE)
-       @echo "config.mk" $(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ") >> $(VERSION_FILE)
-
-############################################################################
-# BEGIN of Include definitions
-#
-include config.mk
-include cache.mk
-#
-# END Include definitions
-#############################################################################
-
-$(ISOCACHE):
-       test -s $(ISOCACHE) || { wget -nv $(CENTDNLD) ; }
+
+.PHONY: clean
+clean:
+       rm -rf $(BUILD_DIR)
+
+.PHONY: clean-cache
+clean-cache:
+       rm -rf $(CACHE_DIR)
+
+.PHONY: images
+images: undercloud overcloud-full overcloud-opendaylight overcloud-onos
+
+.PHONY: rpms
+rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm
+
+.PHONY: rpms-check
+rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check
+
+.PHONY: rpms-clean
+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)
+
+$(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-common-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-common.tar.gz
+
+.PHONY: common-rpm-check
+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: $(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 $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+
+##################
+#  PYTHON TESTS  #
+##################
+
+.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
+
+#######################
+#  PYTHON PEP8 CHECK  #
+#######################
+
+.PHONY: python-pep8-check
+python-pep8-check:
+       pep8 ../lib/python
+       pep8 ../tests
+
+#############
+#  YAMLLINT #
+#############
+
+.PHONY: yamllint
+yamllint:
+       @echo "Running yamllint against all .yaml files"
+       cd ../ && yamllint $(shell cd ../ && git ls-tree -r HEAD --name-only | grep 'yaml$$')
+
+##################
+# NETWORKING-VPP #
+##################
+
+$(BUILD_DIR)/python-networking-vpp.tar.gz:
+       @echo "Preparing the networking-vpp RPM prerequisites"
+       git clone $(NETVPP_REPO) $(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: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm
+
+$(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
+undercloud: $(BUILD_DIR)/undercloud.qcow2
+
+$(BUILD_DIR)/undercloud.qcow2:
+       @echo "Building the Apex Undercloud Image"
+       @./undercloud.sh
+
+$(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_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: $(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: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz $(RPMUDR)
+
+$(RPMUDR):
+       @echo "Building the Apex Undercloud RPM"
+       rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+
+###############
+#  OVERCLOUD  #
+###############
+
+.PHONY: overcloud-full
+overcloud-full: $(BUILD_DIR)/overcloud-full.qcow2
+
+$(BUILD_DIR)/overcloud-full.qcow2: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm
+       @echo "Building the Apex Base Overcloud Image"
+       @./overcloud-full.sh
+
+###############
+#    ODL      #
+###############
+
+.PHONY: overcloud-opendaylight
+overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+
+$(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
+       @echo "Building the Apex OpenDaylight Overcloud Image"
+       @./overcloud-opendaylight.sh
+
+$(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+       tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/overcloud-full-opendaylight.qcow2:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+
+.PHONY: opendaylight-rpm-check
+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: $(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 $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+
+###############
+#    ONOS     #
+###############
+
+.PHONY: overcloud-onos
+overcloud-onos: $(BUILD_DIR)/overcloud-full-onos.qcow2
+
+$(BUILD_DIR)/overcloud-full-onos.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
+       @echo "Building the Apex ONOS Overcloud Image"
+       @./overcloud-onos.sh
+
+$(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2
+       tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/overcloud-full-onos.qcow2:" $(BUILD_DIR)/overcloud-full-onos.qcow2
+
+.PHONY: onos-rpm-check
+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: $(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 $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')"
+
+###############
+#    ISO      #
+###############
+
+$(CENTISO):
+       curl $(CENTDNLD) -z $(CENTISO) -o $(CENTISO) --verbose --silent --location
+
+iso-clean:
+       @rm -Rf $(BUILD_DIR)/centos
+       @rm -Rf $(BUILD_DIR)/release
+       @rm -f $(ISO)
 
 .PHONY: mount-centiso umount-centiso
-mount-centiso: $(ISOCACHE)
+mount-centiso: $(CENTISO)
        @echo "Mounting CentOS ISO in $(CENTDIR)"
        @mkdir -p $(CENTDIR)
-       @fuseiso $(ISOCACHE) $(CENTDIR)
+       @fuseiso $(CENTISO) $(CENTDIR)
 
 umount-centiso:
        @set +e
@@ -73,77 +259,112 @@ umount-centiso:
        @rmdir $(CENTDIR)
        @set -e
 
-.PHONY: build-clean $(SUBCLEAN)
-build-clean: instack-clean $(SUBCLEAN)
-       @rm -Rf centos
-       @rm -Rf release
-       @rm -Rf newiso
-       @rm -f $(NEWISO)
-
-.PHONY: clean $(SUBCLEAN)
-clean:  clean-cache build-clean $(SUBCLEAN)
-       @rm -f *.iso
-       @rm -Rf release
-       @rm -Rf newiso
-       @rm -f $(NEWISO)
-       @rm -f $(BUILD_BASE)/.versions
-
-$(SUBCLEAN): %.clean:
-       $(MAKE) -C $* -f Makefile clean
-
-.PHONY: rpm-clean
-rpm-clean:
-       @rm -f build/opnfv-apex.tar.gz
-
-.PHONY: rpm
-rpm:
-       pushd ../ && git archive --format=tar --prefix=opnfv-apex-2.0/ HEAD > build/opnfv-apex.tar
-       tar -u --xform="s:instack.qcow2:opnfv-apex-2.0/build/instack.qcow2:" --file=opnfv-apex.tar instack.qcow2
-       tar -u --xform="s:instack.xml:opnfv-apex-2.0/build/instack.xml:" --file=opnfv-apex.tar instack.xml
-       qemu-img create -f qcow2 baremetalbrbm_0.qcow2 40G
-       tar -u --xform="s:baremetalbrbm_0.qcow2:opnfv-apex-2.0/build/baremetalbrbm_0.qcow2:" --file=opnfv-apex.tar baremetalbrbm_0.qcow2
-       tar -u --xform="s:baremetalbrbm_0.xml:opnfv-apex-2.0/build/baremetalbrbm_0.xml:" --file=opnfv-apex.tar baremetalbrbm_0.xml
-       qemu-img create -f qcow2 baremetalbrbm_1.qcow2 40G
-       tar -u --xform="s:baremetalbrbm_1.qcow2:opnfv-apex-2.0/build/baremetalbrbm_1.qcow2:" --file=opnfv-apex.tar baremetalbrbm_1.qcow2
-       tar -u --xform="s:baremetalbrbm_1.xml:opnfv-apex-2.0/build/baremetalbrbm_1.xml:" --file=opnfv-apex.tar baremetalbrbm_1.xml
-       tar -u --xform="s:brbm.xml:opnfv-apex-2.0/build/brbm.xml:" --file=opnfv-apex.tar brbm.xml
-       tar -u --xform="s:instackenv-virt.json:opnfv-apex-2.0/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json
-       tar -u --xform="s:stack/deploy-ramdisk-ironic.initramfs:opnfv-apex-2.0/build/stack/deploy-ramdisk-ironic.initramfs:" --file=opnfv-apex.tar stack/deploy-ramdisk-ironic.initramfs
-       tar -u --xform="s:stack/deploy-ramdisk-ironic.kernel:opnfv-apex-2.0/build/stack/deploy-ramdisk-ironic.kernel:" --file=opnfv-apex.tar stack/deploy-ramdisk-ironic.kernel
-       tar -u --xform="s:stack/ironic-python-agent.initramfs:opnfv-apex-2.0/build/stack/ironic-python-agent.initramfs:" --file=opnfv-apex.tar stack/ironic-python-agent.initramfs
-       tar -u --xform="s:stack/ironic-python-agent.kernel:opnfv-apex-2.0/build/stack/ironic-python-agent.kernel:" --file=opnfv-apex.tar stack/ironic-python-agent.kernel
-       tar -u --xform="s:stack/ironic-python-agent.vmlinuz:opnfv-apex-2.0/build/stack/ironic-python-agent.vmlinuz:" --file=opnfv-apex.tar stack/ironic-python-agent.vmlinuz
-       tar -u --xform="s:stack/overcloud-full.initrd:opnfv-apex-2.0/build/stack/overcloud-full.initrd:" --file=opnfv-apex.tar stack/overcloud-full.initrd
-       tar -u --xform="s:stack/overcloud-full.qcow2:opnfv-apex-2.0/build/stack/overcloud-full.qcow2:" --file=opnfv-apex.tar stack/overcloud-full.qcow2
-       tar -u --xform="s:stack/overcloud-full.vmlinuz:opnfv-apex-2.0/build/stack/overcloud-full.vmlinuz:" --file=opnfv-apex.tar stack/overcloud-full.vmlinuz
-       gzip -f opnfv-apex.tar
-       rpmbuild -ba 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 $(REVSTATE) | tr -d '_-')"
-
-.PHONY: instack
-instack: instack.qcow2
-
-instack.qcow2:
-       @./instack.sh $(USE_MASTER)
-
-.PHONY: instack-clean
-instack-clean:
-       rm -f instackenv-virt.json
-       rm -f baremetalbrbm_0.xml
-       rm -f baremetalbrbm_1.xml
-       rm -f instack.xml
-       rm -f instack.qcow2
-
 .PHONY: iso
-iso:   build-clean instack.qcow2 rpm $(ISOCACHE)
-       @mkdir centos release
-       cd centos && bsdtar -xf ../$(shell basename $(ISOSRC))
+iso:   iso-clean images rpms $(CENTISO)
+       @echo "Building the Apex ISO"
+       @mkdir $(BUILD_DIR)/centos $(BUILD_DIR)/release
+       cd $(BUILD_DIR)/centos && bsdtar -xf ../$(shell basename $(CENTISO))
        # modify the installer iso's contents
-       @cp -f isolinux.cfg centos/isolinux/isolinux.cfg
-       @cp $(APEXRPM) 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 $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu
+       cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm
+       cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.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 $(NEWISO) centos
-       @printf "\n\nISO is built at $(NEWISO)\n\n"
+       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
+       cd $(BUILD_DIR) \
+       && curl -O -L artifacts.opnfv.org/apex/dependencies/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 $(RPM_DIR_ARGS) -D "with_python3 1"
+
+########################
+#  python3-markupsafe  #
+########################
+
+.PHONY: python3-markupsafe
+python3-markupsafe:
+       cd $(BUILD_DIR) \
+       && curl -O -L artifacts.opnfv.org/apex/dependencies/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 $(RPM_DIR_ARGS) -D "with_python3 1"
+
+##################
+#  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