HC Test: Workaround for 17.04 jvpp version mismatch

 - add workaround for mismatched jvpp versions in deb packages
 - disable NSH_SFC madule and test suite, it depends on outdated jvpp
 - cleanup package download script used in hc2vpp-csit-verify job

Change-Id: I98526baa4de08bbbab2339c9e81f49cd189b57ac
Signed-off-by: selias <samelias@cisco.com>

2 files changed, 3 insertions, 36 deletions

diff --git a/resources/tools/download_hc_build_pkgs.sh b/resources/tools/download_hc_build_pkgs.sh
index 4dc49f9d82..71a2efea24 100755
--- a/resources/tools/download_hc_build_pkgs.sh
+++ b/resources/tools/download_hc_build_pkgs.sh
@@ -18,20 +18,15 @@ set -ex
 trap 'rm -f *.deb.md5; exit' EXIT
 trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR
 
-# Download the latest VPP .deb packages, their matching JVPP .jar and VPP plugin .deb packages
+# Download the latest VPP and VPP plugin .deb packages
 URL="https://nexus.fd.io/service/local/artifact/maven/content"
 VER="LATEST"
 REPO='fd.io.master.ubuntu.trusty.main'
-JVPP_REPO='fd.io.snapshot'
 VPP_GROUP="io.fd.vpp"
-HC_GROUP="io.fd.hc2vpp"
 NSH_GROUP="io.fd.nsh_sfc"
-VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins"
-JVPP_ARTIFACTS="jvpp-core jvpp-registry jvpp-acl jvpp-snat jvpp-ioam-pot jvpp-ioam-trace"
-HC_ARTIFACTS="honeycomb"
+VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java"
 NSH_ARTIFACTS="vpp-nsh-plugin"
 PACKAGE="deb deb.md5"
-JVPP_PACKAGE="jar jar.md5"
 CLASS="deb"
 
 for ART in ${VPP_ARTIFACTS}; do
@@ -40,18 +35,6 @@ for ART in ${VPP_ARTIFACTS}; do
     done
 done
 
-for ART in ${JVPP_ARTIFACTS}; do
-    for PAC in $JVPP_PACKAGE; do
-        curl "${URL}?r=${JVPP_REPO}&g=${VPP_GROUP}&a=${ART}&p=${PAC}&v=${VER}" -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 ${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
@@ -62,22 +45,6 @@ for FILE in *.deb; do
     echo " "${FILE} >> ${FILE}.md5
 done
 
-for FILE in *.jar; do
-    echo " "${FILE} >> ${FILE}.md5
-done
-
 for MD5FILE in *.md5; do
     md5sum -c ${MD5FILE} || exit
 done
-
-# Install JVPP to maven local repo, to be used in HC2VPP build
-JVPP_JARS=$(find . -type f -iname '*.jar')
-for item in jvpp*.jar; do
-    # Example filename: jvpp-registry-17.01-20161206.125556-1.jar
-    # ArtifactId = jvpp-registry
-    # Version = 17.01
-    basefile=$(basename -s .jar "$item")
-    artifactId=$(echo "$basefile" | cut -d '-' -f 1-2)
-    version=$(echo "$basefile" | cut -d '-' -f 3)
-    mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-done
diff --git a/resources/tools/download_hc_pkgs.sh b/resources/tools/download_hc_pkgs.sh
index 8533db0283..d52e2469e0 100755
--- a/resources/tools/download_hc_pkgs.sh
+++ b/resources/tools/download_hc_pkgs.sh
@@ -24,7 +24,7 @@ REPO='fd.io.master.ubuntu.trusty.main'
 GROUP="io.fd.vpp"
 HC_GROUP="io.fd.hc2vpp"
 NSH_GROUP="io.fd.nsh_sfc"
-VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins"
+VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java"
 HC_ARTIFACTS="honeycomb"
 NSH_ARTIFACTS="vpp-nsh-plugin"
 PACKAGE="deb deb.md5"