Merge "Updates VPP packages to latest master version" into stable/colorado

3 files changed, 12 insertions, 21 deletions

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 8ec7af6b..4b348565 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -50,12 +50,6 @@ for package in ${dpdk_rpms[@]}; do
   dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
 done
 
-fdio_pkg_str=''
-for package in ${fdio_pkgs[@]}; do
-  wget "$fdio_uri_base/$package"
-  fdio_pkg_str+=" --upload $package:/root/fdio"
-done
-
 # tar up the congress puppet module
 rm -rf puppet-congress
 git clone -b stable/mitaka https://github.com/radez/puppet-congress
@@ -95,6 +89,15 @@ popd > /dev/null
 # replace repo with latest delorean mitaka
 wget https://trunk.rdoproject.org/centos7-mitaka/current-passed-ci/delorean.repo
 
+# Master FD.IO Repo
+cat > /tmp/fdio.repo << EOF
+[fdio-master]
+name=fd.io master branch latest merge
+baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+enabled=1
+gpgcheck=0
+EOF
+
 # installing forked opnfv-puppet-tripleo
 # enable connection tracking for protocal sctp
 # upload dpdk rpms but do not install
@@ -116,9 +119,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --run-command "mkdir /root/dpdk_rpms" \
-    --run-command "mkdir /root/fdio" \
+    --upload /tmp/fdio.repo:/etc/yum.repos.d/fdio.repo \
     $dpdk_pkg_str \
-    $fdio_pkg_str \
+    --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \
     --upload ../networking-vpp.noarch.rpm:/root/fdio \
     --run-command "pip install distro flask_restful" \
     --run-command "yum install -y etcd" \
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index af65910e..377a9a93 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -46,8 +46,6 @@ EOF
 # SDNVPN - Copy tunnel setup script
 wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
 
-# Honeycomb RPM
-wget $fdio_uri_base/$honeycomb_pkg
 
 # install ODL packages
 # install Jolokia for ODL HA
@@ -62,8 +60,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
     --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
     --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
-    --upload $honeycomb_pkg:/root/ \
-    --run-command "yum -y install /root/$honeycomb_pkg" \
+    --install honeycomb \
     --upload ./setup_TEPs.py:/tmp \
     -a overcloud-full-opendaylight_build.qcow2
 
diff --git a/build/variables.sh b/build/variables.sh
index c92be375..81e129d8 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -27,15 +27,6 @@ dpdk_rpms=(
 'ovs4opnfv-e8acab14-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
 )
 
-fdio_uri_base=http://artifacts.opnfv.org/apex/colorado
-fdio_pkgs=(
-'vpp-16.09-release.x86_64.rpm'
-'vpp-devel-16.09-release.x86_64.rpm'
-'vpp-lib-16.09-release.x86_64.rpm'
-'vpp-python-api-16.09-release.x86_64.rpm'
-)
-honeycomb_pkg='honeycomb-1.16.9-FINAL.noarch.rpm'
-
 virt_uri_base=https://people.redhat.com/~rjones/libguestfs-RHEL-7.3-preview
 libguestfs_pkg='libguestfs-1.32.7-3.el7.x86_64.rpm'
 virt_pkgs=(