X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2FMakefile;h=f599f42f94c5b5b79a5a0e8f51d975ade644affb;hb=8963743396666507109ee4922a541f0dc164b796;hp=8a498a662e220c34272aee197243fca4ec43bc3a;hpb=d84beb35dfa3a804eef35e1349ffec74ef9bbd87;p=apex.git

diff --git a/build/Makefile b/build/Makefile
index 8a498a66..f599f42f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -19,6 +19,10 @@ export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE
 export RPMONO = $(shell pwd)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 export RPMSFC = $(shell pwd)/noarch/opnfv-apex-opendaylight-sfc-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 
+all_networks="admin_network private_network storage_network external_network api_network"
+
+
+
 .PHONY: all
 all: iso
 
@@ -56,6 +60,19 @@ $(RPMCOM):
 	# build the common RPM
 	rpmbuild --clean -ba 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 '_-')"
 
+##################
+#  PYTHON TESTS  #
+##################
+
+.PHONY: python-tests
+python-tests:
+	# run nose tests
+	cd ../tests && PYTHONPATH=../lib/python/ nosetests-3.4 . --with-coverage --cover-package apex
+	# generate reports
+	cd ../tests && coverage3 html --include '*lib/python/*'
+	cd ../tests && coverage3 report --include '*lib/python/*' -m
+
+
 ###############
 #  UNDERCLOUD #
 ###############
@@ -239,7 +256,16 @@ iso:	iso-clean images rpms $(CENTISO)
 	@ln $(RPMODL) centos/Packages
 	@ln $(RPMONO) centos/Packages
 	@ln $(RPMSFC) centos/Packages
-	cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo && yumdownloader jq
+	# 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 && 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
 	# regenerate yum repo data
 	@echo "Generating new yum metadata"
 	createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos
@@ -248,3 +274,43 @@ iso:	iso-clean images rpms $(CENTISO)
 	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
 	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