X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fscripts%2Fdownload_hc_build_pkgs.sh;h=4b7f1dfa3baf4f1ced0f23b8d385d6e2e48ea078;hp=66834999569ee55f6bd995de80a8606186d4122f;hb=90db5f03887e5b520d12331f908dbdf01c52f9ee;hpb=28dd384dbf9d791bbe2cac7a09227008f85bb64f

diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 6683499956..4b7f1dfa3b 100755
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -22,19 +22,20 @@ OS=$2
 URL="https://nexus.fd.io/service/local/artifact/maven/content"
 VER="RELEASE"
 VPP_GROUP="io.fd.vpp"
-NSH_GROUP="io.fd.nsh_sfc"
-NSH_ARTIFACTS="vpp-nsh-plugin"
+# TODO(CSIT-994): reenable NSH
+# NSH_GROUP="io.fd.nsh_sfc"
+# NSH_ARTIFACTS="vpp-nsh-plugin"
 
 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"
@@ -50,11 +51,12 @@ for ART in ${VPP_ARTIFACTS}; do
     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
+# TODO(CSIT-994): reenable NSH
+# 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
 
 # verify downloaded packages
 if [ "${OS}" == "centos7" ]; then
@@ -79,7 +81,7 @@ else
 fi
 
 # install jvpp jars into maven repo, so that maven picks them up when building hc2vpp
-version=`../jvpp-version`
+version=`../jvpp/version`
 
 current_dir=`pwd`
 cd /usr/share/java