From af7aa485a0eb746a7d7c6a5b5dcf00ed9f4eba57 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Wed, 26 Apr 2017 08:01:15 -0400 Subject: Update VPP/ODL versions for FDIO scenarios Pin the same set of FDIO and OpenDaylight versions for all fdio scenarios. Note that fdio_netvirt-fdio still uses a customized ODL version. os-net-config-pr: 7 JIRA: APEX-451 Change-Id: Ic5ac5aeead9967fe383447e23653276cde2dfe60 Signed-off-by: Feng Pan --- build/variables.sh | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'build/variables.sh') diff --git a/build/variables.sh b/build/variables.sh index 6064dc8e..23f25eb2 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -57,27 +57,11 @@ netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noar gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm -fdio_l3_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l3_rpms -fdio_l3_pkgs=( -'vpp-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' -'vpp-api-python-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' -'vpp-lib-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' -'vpp-plugins-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' -'honeycomb-1.17.04-2503.noarch.rpm' +fdio_pkgs=( +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/17.04-release.x86_64/vpp-17.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/17.04-release.x86_64/vpp-api-python-17.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/17.04-release.x86_64/vpp-lib-17.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/17.04-release.x86_64/vpp-plugins-17.04-release.x86_64.rpm' ) -fdio_l2_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l2_rpms -fdio_l2_pkgs=( -'vpp-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -'vpp-api-python-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -) - -fdio_nosdn_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_nosdn_rpms -fdio_nosdn_pkgs=( -'vpp-17.04-rc0~476_geaabe07~b2100.x86_64.rpm' -'vpp-api-python-17.04-rc0~476_geaabe07~b2100.x86_64.rpm' -'vpp-lib-17.04-rc0~476_geaabe07~b2100.x86_64.rpm' -'vpp-plugins-17.04-rc0~476_geaabe07~b2100.x86_64.rpm' -) +honeycomb_pkg='http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/honeycomb-1.17.04-2048.noarch.rpm' \ No newline at end of file -- cgit 1.2.3-korg