From 497f606967363d88b4b36b74859ad360eba9eccd Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 14 Nov 2019 10:06:03 +0100 Subject: NSH_SFC: Remove Change-Id: Ib7f9dff7bede4f8ec3148f234109132be920de82 Signed-off-by: Tibor Frank --- resources/tools/doc_gen/src/index.rst | 1 - resources/tools/doc_gen/src/tests.nsh_sfc.func.rst | 3 - resources/tools/presentation/conf.py | 2 - resources/tools/presentation/doc/pal_lld.rst | 8 --- resources/tools/presentation/specification.yaml | 1 - resources/tools/scripts/download_nsh_sfc_pkgs.sh | 65 ---------------------- 6 files changed, 80 deletions(-) delete mode 100644 resources/tools/doc_gen/src/tests.nsh_sfc.func.rst delete mode 100755 resources/tools/scripts/download_nsh_sfc_pkgs.sh (limited to 'resources/tools') diff --git a/resources/tools/doc_gen/src/index.rst b/resources/tools/doc_gen/src/index.rst index 6ba9a2671b..fb12eb517b 100644 --- a/resources/tools/doc_gen/src/index.rst +++ b/resources/tools/doc_gen/src/index.rst @@ -11,7 +11,6 @@ Contents resources.libraries.robot tests.dmm.func tests.dpdk.perf - tests.nsh_sfc.func tests.tldk.func tests.vpp.device tests.vpp.perf diff --git a/resources/tools/doc_gen/src/tests.nsh_sfc.func.rst b/resources/tools/doc_gen/src/tests.nsh_sfc.func.rst deleted file mode 100644 index e06d26dc7c..0000000000 --- a/resources/tools/doc_gen/src/tests.nsh_sfc.func.rst +++ /dev/null @@ -1,3 +0,0 @@ -NSH SFC Functional Tests -======================== - diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 9b1a8ef33d..ae781bdac8 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -82,7 +82,6 @@ rst_epilog = """ .. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.dpdk.perf.html .. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.html .. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.html -.. _CSIT NSH_SFC Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.nsh_sfc.func.html .. _CSIT DMM Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.dmm.func.html .. _CSIT VPP Device Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.device.html .. _VPP test framework documentation: https://docs.fd.io/vpp/{vpprelease}/vpp_make_test/html/ @@ -103,7 +102,6 @@ rst_epilog = """ .. _FD.io test executor vpp functional jobs using CentOs: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-{srelease}-centos7-virl .. _FD.io test executor vpp device jobs using Ubuntu: https://jenkins.fd.io/view/csit/job/csit-vpp-device-{srelease}-ubuntu1804-1n-skx .. _FD.io test executor Honeycomb functional jobs: https://jenkins.fd.io/view/csit/job/hc2vpp-csit-integration-{srelease}-ubuntu1604 -.. _FD.io test executor NSH_SFC functional jobs: https://jenkins.fd.io/view/csit/job/csit-nsh_sfc-verify-func-{srelease}-ubuntu1604-virl .. _FD.io test executor DMM functional jobs: https://jenkins.fd.io/view/csit/job/csit-dmm-functional-{srelease}-ubuntu1604-virl .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1604/ .. _FD.io DPDK compile job: https://jenkins.fd.io/view/deb-dpdk/job/deb_dpdk-merge-{sdpdkrelease}-ubuntu1604/ diff --git a/resources/tools/presentation/doc/pal_lld.rst b/resources/tools/presentation/doc/pal_lld.rst index e3589ae748..d3a9782681 100644 --- a/resources/tools/presentation/doc/pal_lld.rst +++ b/resources/tools/presentation/doc/pal_lld.rst @@ -170,7 +170,6 @@ The structure of the section "Environment" is as follows (example): DIR[DTR,PERF,DPDK]: "{DIR[DTR]}/dpdk_performance_results" DIR[DTR,PERF,VPP]: "{DIR[DTR]}/vpp_performance_results" DIR[DTR,FUNC,VPP]: "{DIR[DTR]}/vpp_functional_results" - DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results" DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements" # Detailed test configurations @@ -365,10 +364,6 @@ The structure of the section "Debug" is as follows (example): - build: 9 file: "csit-dpdk-perf-1707-all__9.xml" - csit-nsh_sfc-verify-func-1707-ubuntu1604-virl: - - - build: 2 - file: "csit-nsh_sfc-verify-func-1707-ubuntu1604-virl-2.xml" csit-vpp-functional-1707-ubuntu1604-virl: - build: lastSuccessfulBuild @@ -471,9 +466,6 @@ The structure of the section "Input" is as follows (example from 17.07 report): - 9 hc2vpp-csit-integration-1707-ubuntu1604: - lastSuccessfulBuild - csit-nsh_sfc-verify-func-1707-ubuntu1604-virl: - - 2 - Section: Output ''''''''''''''' diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 127768d680..f4ad61686d 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -45,7 +45,6 @@ DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu" DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos" DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu" - DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results" DIR[DTR,FUNC,DMM]: "{DIR[DTR]}/dmm_functional_results" DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements" diff --git a/resources/tools/scripts/download_nsh_sfc_pkgs.sh b/resources/tools/scripts/download_nsh_sfc_pkgs.sh deleted file mode 100755 index 2261f084e5..0000000000 --- a/resources/tools/scripts/download_nsh_sfc_pkgs.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2017 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -trap 'rm -f *.deb.md5; exit' EXIT -trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR - -STREAM=$1 -OS=$2 - -URL="https://nexus.fd.io/service/local/artifact/maven/content" -VER="RELEASE" -GROUP="io.fd.vpp" -NSH_GROUP="io.fd.nsh_sfc" -VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java vpp-api-python vpp-api-lua" -NSH_ARTIFACTS="vpp-nsh-plugin" - -if [ "${OS}" == "ubuntu1404" ]; then - OS="ubuntu.trusty.main" - PACKAGE="deb deb.md5" - CLASS="deb" -elif [ "${OS}" == "ubuntu1604" ]; then - OS="ubuntu.xenial.main" - PACKAGE="deb deb.md5" - CLASS="deb" -elif [ "${OS}" == "centos7" ]; then - OS="centos7" - PACKAGE="rpm rpm.md5" - CLASS="rpm" -fi - -REPO="fd.io.${STREAM}.${OS}" - -for ART in ${VPP_ARTIFACTS}; do - for PAC in $PACKAGE; do - curl "${URL}?r=${REPO}&g=${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 - -for FILE in *.deb; do - echo " "${FILE} >> ${FILE}.md5 -done - -for MD5FILE in *.md5; do - md5sum -c ${MD5FILE} || exit -done -- cgit 1.2.3-korg