From 12a708852932c96c66a453adc24339b746971f7a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 15 May 2018 08:30:39 +0200 Subject: HC tests: disable NSH plugin (CSIT-994) This reverts https://gerrit.fd.io/r/#/c/12209/ Change-Id: I1de4ce6e96644881aa14adf6765e8a67b286595d Signed-off-by: Marek Gradzki --- resources/tools/scripts/download_hc_build_pkgs.sh | 16 +++++++++------- resources/tools/scripts/download_hc_pkgs.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'resources/tools') diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh index 3763c0999c..474344a320 100755 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ b/resources/tools/scripts/download_hc_build_pkgs.sh @@ -22,8 +22,9 @@ 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" @@ -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 diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh index a7562aa7f4..38c565f97f 100755 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ b/resources/tools/scripts/download_hc_pkgs.sh @@ -22,9 +22,10 @@ URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" GROUP="io.fd.vpp" HC_GROUP="io.fd.hc2vpp" -NSH_GROUP="io.fd.nsh_sfc" HC_ARTIFACTS="honeycomb" -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" @@ -61,11 +62,12 @@ for ART in ${DPDK_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 # determine VPP dependency # use latest if honeycomb package does not depend on single VPP version, e.g. stable branches since HC2VPP-285 -- cgit 1.2.3-korg