From 0650d657240d7f1123a287d505fac7de8e91528b Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 30 Oct 2017 14:02:06 +0100 Subject: [PATCH] Update of VPP_STABLE_VER files and DPDK_STABLE_VER file - use new vpp ref build - ubuntu 16.04: 18.01-rc0~156-gae5a02f~b3093_amd64 - use new vpp ref build - centos7: 18.01-rc0~156_gae5a02f~b3090.x86_64 - use new dpdk version: 17.08-vpp2 - builds tested by semiweekly jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-verify-master-ubuntu1604-semiweekly/85/ https://jenkins.fd.io/view/csit/job/csit-vpp-verify-master-centos7-semiweekly/85/ - remove vpp-debuginfo centos7 artifact as not provided for new versions Change-Id: I18445feac98304e7e7ecdf77968acebf2d5aef09 Signed-off-by: Jan Gelety --- DPDK_STABLE_VER | 2 +- VPP_STABLE_VER_CENTOS | 2 +- VPP_STABLE_VER_UBUNTU | 2 +- bootstrap-vpp-verify-weekly.sh | 2 +- bootstrap.sh | 2 +- resources/tools/scripts/download_install_vpp_pkgs.sh | 2 +- resources/tools/scripts/download_install_vpp_rpms.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DPDK_STABLE_VER b/DPDK_STABLE_VER index bda503fdc4..9ee3f589fa 100644 --- a/DPDK_STABLE_VER +++ b/DPDK_STABLE_VER @@ -1 +1 @@ -17.08-vpp1 +17.08-vpp2 diff --git a/VPP_STABLE_VER_CENTOS b/VPP_STABLE_VER_CENTOS index df7a878faa..d4d0860003 100644 --- a/VPP_STABLE_VER_CENTOS +++ b/VPP_STABLE_VER_CENTOS @@ -1 +1 @@ -17.10-rc0~334_gce41a5c~b2867.x86_64 \ No newline at end of file +18.01-rc0~156_gae5a02f~b3090.x86_64 \ No newline at end of file diff --git a/VPP_STABLE_VER_UBUNTU b/VPP_STABLE_VER_UBUNTU index a0b7161937..08678a89a7 100644 --- a/VPP_STABLE_VER_UBUNTU +++ b/VPP_STABLE_VER_UBUNTU @@ -1 +1 @@ -17.10-rc0~334-gce41a5c~b2870_amd64 \ No newline at end of file +18.01-rc0~156-gae5a02f~b3093_amd64 \ No newline at end of file diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index ecd0f158e8..9ae7767510 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -119,7 +119,7 @@ done # Temporarily download VPP and DPDK packages from nexus.fd.io case "$DISTRO" in CENTOS ) - VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins" + VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" diff --git a/bootstrap.sh b/bootstrap.sh index 54d6ff7ba3..ebbe752a4e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,7 +23,7 @@ export PYTHONPATH=${SCRIPT_DIR} if [ -f "/etc/redhat-release" ]; then DISTRO="CENTOS" sudo yum install -y python-devel python-virtualenv - VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins" + VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" diff --git a/resources/tools/scripts/download_install_vpp_pkgs.sh b/resources/tools/scripts/download_install_vpp_pkgs.sh index 8928a2fee2..0dd597d3ee 100755 --- a/resources/tools/scripts/download_install_vpp_pkgs.sh +++ b/resources/tools/scripts/download_install_vpp_pkgs.sh @@ -34,7 +34,7 @@ if [ -f "/etc/redhat-release" ]; then MD5FILES=*.rpm.md5 fi - ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins" + ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins" PACKAGE="rpm rpm.md5" CLASS="" VPP_INSTALL_COMMAND="rpm -ivh *.rpm" diff --git a/resources/tools/scripts/download_install_vpp_rpms.sh b/resources/tools/scripts/download_install_vpp_rpms.sh index 29e09216db..25390fbf88 100644 --- a/resources/tools/scripts/download_install_vpp_rpms.sh +++ b/resources/tools/scripts/download_install_vpp_rpms.sh @@ -26,7 +26,7 @@ else REPO='https://nexus.fd.io/content/repositories/fd.io.centos7' fi -ARTIFACTS="vpp vpp-lib vpp-debuginfo vpp-devel vpp-python-api vpp-plugins" +ARTIFACTS="vpp vpp-lib vpp-devel vpp-python-api vpp-plugins" yum-config-manager --add-repo $REPO -- 2.16.6