From 7661991a8f8fbd9282dcbbfcdeac7867e5925b96 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Sat, 30 Sep 2017 01:15:31 -0400 Subject: nosdn-fdio scenarios fixes - pin vpp/networking-vpp versions - Add external_network_bridge config back to puppet-neutron Change-Id: Ia58fb55638390757ea3350b2921897c4d315f9b5 Signed-off-by: Feng Pan --- build/variables.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'build/variables.sh') diff --git a/build/variables.sh b/build/variables.sh index 69e1fa09..ee0944c8 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -39,8 +39,15 @@ kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube" kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm" netvpp_repo="https://github.com/openstack/networking-vpp" -netvpp_branch="master" +netvpp_branch="17.07" netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') -netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm +netvpp_pkg=python-networking-vpp-17.07-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm + +nosdn_vpp_rpms=( +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/17.07.01-release.x86_64/vpp-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/17.07.01-release.x86_64/vpp-api-python-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/17.07.01-release.x86_64/vpp-lib-17.07.01-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/17.07.01-release.x86_64/vpp-plugins-17.07.01-release.x86_64.rpm' +) \ No newline at end of file -- cgit 1.2.3-korg