HC tests: reenable NSH plugin (CSIT-994)

[csit.git] / resources / tools / scripts / download_hc_pkgs.sh

diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh
index 23e0be4..a7562aa 100755 (executable)
--- a/resources/tools/scripts/download_hc_pkgs.sh
+++ b/resources/tools/scripts/download_hc_pkgs.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
+set -x
 
 STREAM=$1
 OS=$2
@@ -30,19 +30,19 @@ if [ "${OS}" == "ubuntu1404" ]; then
     OS="ubuntu.trusty.main"
     PACKAGE="deb deb.md5"
     CLASS="deb"
-    VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-lib vpp-plugins vpp-api-java"
+    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-dev vpp-lib vpp-plugins vpp-api-java"
+    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-devel vpp-lib vpp-plugins vpp-api-java"
+    VPP_ARTIFACTS="vpp vpp-debuginfo vpp-lib vpp-plugins"
     DPDK_ARTIFACTS=""
 fi
 
@@ -68,12 +68,18 @@ for ART in ${NSH_ARTIFACTS}; do
 done
 
 # determine VPP dependency
+# use latest if honeycomb package does not depend on single VPP version, e.g. stable branches since HC2VPP-285
+VER="RELEASE"
 if [ "${OS}" == "centos7" ]; then
-    VER=`rpm -qpR honeycomb*.rpm | grep 'vpp ' | cut -d ' ' -f 3`
-    VER=${VER}.x86_64
+    HC_VPP_VER=`rpm -qpR honeycomb*.rpm | grep -oP 'vpp = \K.+'`
+    if [ "${HC_VPP_VER}" != "" ]; then
+        VER=${HC_VPP_VER}.x86_64
+    fi
 else
-    VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'`
-    VER=${VER}_amd64
+    HC_VPP_VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'`
+    if [ "${HC_VPP_VER}" != "" ]; then
+        VER=${HC_VPP_VER}_amd64
+    fi
 fi
 
 # download VPP packages