X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fscripts%2Fdownload_hc_pkgs.sh;h=a7562aa7f48fc3d67373d3eadb8939880d4e8e6e;hp=2bb2a08e1752bf3af8df247c9dafef7483f4cedf;hb=964cb57bfc40efe2e22d472e58ac060e79bfacaf;hpb=fafd11b96232ab45b200e5f0f59a4bdc3ddee40a

diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh
index 2bb2a08e17..a7562aa7f4 100755
--- 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
@@ -61,20 +61,25 @@ for ART in ${DPDK_ARTIFACTS}; do
     done
 done
 
-# NSHSFC-34: Having NSH plugin installed crashes VPP
-#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
-#    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
+    done
+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