diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-04-26 10:11:32 +0200 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2018-04-27 11:18:53 +0000 |
| commit | 973b459199dc617f4364a891c4d74ac559639caa (patch) | |
| tree | 47c84ffd1e479d1c2b8356cad3bd0658b05aed20 /resources | |
| parent | f5d0c4d77058099fdd48a161e05c83676b119c2c (diff) | |
HC tests: reenable NSH plugin (CSIT-994)
Reverts https://gerrit.fd.io/r/#/c/11088/
Change-Id: Ib7b70d33f4a8110656dd39f25b7f5a67a2f52104
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'resources')
| -rwxr-xr-x | resources/tools/scripts/download_hc_build_pkgs.sh | 16 | ||||
| -rwxr-xr-x | resources/tools/scripts/download_hc_pkgs.sh | 16 |
2 files changed, 14 insertions, 18 deletions
diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh index 474344a320..3763c0999c 100755 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ b/resources/tools/scripts/download_hc_build_pkgs.sh @@ -22,9 +22,8 @@ OS=$2 URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" VPP_GROUP="io.fd.vpp" -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" +NSH_GROUP="io.fd.nsh_sfc" +NSH_ARTIFACTS="vpp-nsh-plugin" if [ "${OS}" == "ubuntu1404" ]; then OS="ubuntu.trusty.main" @@ -51,12 +50,11 @@ for ART in ${VPP_ARTIFACTS}; do 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 +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 38c565f97f..a7562aa7f4 100755 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ b/resources/tools/scripts/download_hc_pkgs.sh @@ -22,10 +22,9 @@ 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" -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" +NSH_ARTIFACTS="vpp-nsh-plugin" if [ "${OS}" == "ubuntu1404" ]; then OS="ubuntu.trusty.main" @@ -62,12 +61,11 @@ for ART in ${DPDK_ARTIFACTS}; do 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 +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 |