From: Tim Rozet <trozet@redhat.com>
Date: Mon, 2 Oct 2017 13:08:22 +0000 (+0000)
Subject: Merge "nosdn-fdio scenarios fixes"
X-Git-Tag: opnfv-6.0.0~83
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d77be7913b633291e6d864b0a3a2db7e9c18a0b;p=apex.git

Merge "nosdn-fdio scenarios fixes"
---

7d77be7913b633291e6d864b0a3a2db7e9c18a0b
diff --cc build/variables.sh
index 376f5682,ee0944c8..b0713268
--- a/build/variables.sh
+++ b/build/variables.sh
@@@ -38,12 -38,16 +38,19 @@@ dpdk_rpms=
  kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube"
  kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm"
  
 +calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install"
 +calipso_script="calipso-installer.py"
 +
  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'
+ )