From 2e8a022b39de4dfb87941166a83f2b7c87150a21 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 23 Jul 2018 09:04:20 +0200 Subject: HC Tests: remove vpp-dpdk-dkms dependency The vpp-dpdk-dkms is not needed for current VPP versions. Change-Id: I9c1a79fb940b2ba0f332792d4fc088f49f9ee191 Signed-off-by: Marek Gradzki --- resources/tools/scripts/download_hc_build_pkgs.sh | 4 ++-- resources/tools/scripts/download_hc_pkgs.sh | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh index 3763c0999c..5319ff306f 100755 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ b/resources/tools/scripts/download_hc_build_pkgs.sh @@ -29,12 +29,12 @@ if [ "${OS}" == "ubuntu1404" ]; then OS="ubuntu.trusty.main" PACKAGE="deb deb.md5" CLASS="deb" - VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" + VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-lib vpp-plugins vpp-api-java" elif [ "${OS}" == "ubuntu1604" ]; then OS="ubuntu.xenial.main" PACKAGE="deb deb.md5" CLASS="deb" - VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" + VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-lib vpp-plugins vpp-api-java" elif [ "${OS}" == "centos7" ]; then OS="centos7" PACKAGE="rpm rpm.md5" diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh index a7562aa7f4..5911b05e3b 100755 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ b/resources/tools/scripts/download_hc_pkgs.sh @@ -31,36 +31,27 @@ if [ "${OS}" == "ubuntu1404" ]; then PACKAGE="deb deb.md5" CLASS="deb" VPP_ARTIFACTS="vpp vpp-dbg vpp-lib vpp-plugins" - DPDK_ARTIFACTS="vpp-dpdk-dkms" elif [ "${OS}" == "ubuntu1604" ]; then OS="ubuntu.xenial.main" PACKAGE="deb deb.md5" CLASS="deb" VPP_ARTIFACTS="vpp vpp-dbg vpp-lib vpp-plugins" - DPDK_ARTIFACTS="vpp-dpdk-dkms" elif [ "${OS}" == "centos7" ]; then OS="centos7" PACKAGE="rpm rpm.md5" CLASS="" VPP_ARTIFACTS="vpp vpp-debuginfo vpp-lib vpp-plugins" - DPDK_ARTIFACTS="" fi REPO="fd.io.${STREAM}.${OS}" -# download latest honeycomb, vpp-dpdk and nsh packages +# download latest honeycomb and nsh packages for ART in ${HC_ARTIFACTS}; do for PAC in ${PACKAGE}; do curl "${URL}?r=${REPO}&g=${HC_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit done done -for ART in ${DPDK_ARTIFACTS}; do - for PAC in ${PACKAGE}; do - curl "${URL}?r=${REPO}&g=${GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit - done -done - for ART in ${NSH_ARTIFACTS}; do for PAC in ${PACKAGE}; do curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit -- cgit 1.2.3-korg