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 <mgradzki@cisco.com>

diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 474344a..4b7f1df 100755 (executable)
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -30,12 +30,12 @@ if [ "${OS}" == "ubuntu1404" ]; then
     OS="ubuntu.trusty.main"
     PACKAGE="deb deb.md5"
     CLASS="deb"
     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"
 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"
 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 38c565f..c8e9021 100755 (executable)
--- a/resources/tools/scripts/download_hc_pkgs.sh
+++ b/resources/tools/scripts/download_hc_pkgs.sh
@@ -32,36 +32,27 @@ if [ "${OS}" == "ubuntu1404" ]; then
     PACKAGE="deb deb.md5"
     CLASS="deb"
     VPP_ARTIFACTS="vpp vpp-dbg vpp-lib vpp-plugins"
     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"
 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"
 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}"
 
 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 ${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
-

 # TODO(CSIT-994): reenable NSH
 # for ART in ${NSH_ARTIFACTS}; do
 #     for PAC in ${PACKAGE}; do
 # TODO(CSIT-994): reenable NSH
 # for ART in ${NSH_ARTIFACTS}; do
 #     for PAC in ${PACKAGE}; do