aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap-hc2vpp-integration-odl.sh3
-rwxr-xr-xbootstrap-hc2vpp-integration.sh2
-rwxr-xr-xbootstrap-hc2vpp-verify-odl.sh3
-rwxr-xr-xbootstrap-hc2vpp-verify.sh2
-rwxr-xr-xresources/tools/scripts/download_hc_build_pkgs.sh16
-rwxr-xr-xresources/tools/scripts/download_hc_pkgs.sh16
6 files changed, 26 insertions, 16 deletions
diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh
index e4d751d866..abffaab066 100755
--- a/bootstrap-hc2vpp-integration-odl.sh
+++ b/bootstrap-hc2vpp-integration-odl.sh
@@ -233,11 +233,12 @@ if [ "$?" -ne "0" ]; then
echo "However, the tests will start."
fi
+# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
--suite "tests.honeycomb.func" \
--include HC_FUNC \
- --exclude HC_REST_ONLY \
+ --exclude hc_nshORhc_rest_only \
--noncritical EXPECTED_FAILING \
--variable HC_ODL:${ODL} \
tests/
diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh
index de903361bd..f2858ffbad 100755
--- a/bootstrap-hc2vpp-integration.sh
+++ b/bootstrap-hc2vpp-integration.sh
@@ -232,10 +232,12 @@ if [ "$?" -ne "0" ]; then
echo "However, the tests will start."
fi
+# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
--suite "tests.honeycomb.func" \
--include HC_FUNC \
+ --exclude HC_NSH \
--noncritical EXPECTED_FAILING \
tests/
diff --git a/bootstrap-hc2vpp-verify-odl.sh b/bootstrap-hc2vpp-verify-odl.sh
index ed28463f42..112919fca1 100755
--- a/bootstrap-hc2vpp-verify-odl.sh
+++ b/bootstrap-hc2vpp-verify-odl.sh
@@ -232,11 +232,12 @@ fi
rm -rf ~/*karaf*
cp /nfs/common/karaf_${ODL} ~
+# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
--suite "tests.honeycomb.func" \
--include HC_FUNC \
- --exclude HC_REST_ONLY \
+ --exclude hc_nshORhc_rest_only \
--noncritical EXPECTED_FAILING \
--variable HC_ODL:${ODL} \
tests/
diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh
index 7be50d8172..6c136759be 100755
--- a/bootstrap-hc2vpp-verify.sh
+++ b/bootstrap-hc2vpp-verify.sh
@@ -227,10 +227,12 @@ if [ "$?" -ne "0" ]; then
echo "However, the tests will start."
fi
+# TODO(CSIT-994): reenable NSH
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
--suite "tests.honeycomb.func" \
--include HC_FUNC \
+ --exclude HC_NSH \
--noncritical EXPECTED_FAILING \
tests/
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