diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 10 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 9 | ||||
| -rw-r--r-- | build/variables.sh | 8 |
3 files changed, 26 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index 3f3d1c3a..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 @@ -62,7 +66,11 @@ $(RPMCOM): .PHONY: python-tests python-tests: - cd ../tests && ./python-coverage.sh + # 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 ############### diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 065201f8..af978edb 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -23,10 +23,19 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 pushd images > /dev/null +dpdk_pkg_str='' +for package in ${dpdk_rpms[@]}; do + curl -O "$dpdk_uri_base/$package" + dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" +done + # remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV # enable connection tracking for protocal sctp +# upload dpdk rpms but do not install LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ + --run-command "mkdir /root/dpdk_rpms" \ + $dpdk_pkg_str \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/build/variables.sh b/build/variables.sh index 115650da..ad1edf91 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -11,3 +11,11 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/ onos_release_file=onos-1.5.0.tar.gz + +dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv +dpdk_rpms=( +'ovs4opnfv-dpdk-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-devel-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-examples-16.04.0-2.el7.centos.x86_64.rpm' +'ovs4opnfv-dpdk-tools-16.04.0-2.el7.centos.x86_64.rpm' +)
\ No newline at end of file |