X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=a944ea3653b050cc0514302c349018719294d7e4;hp=f756d3596d95221712a316016fdbb5b467774e4e;hb=6928c2b1620e5d020a19e944f416df6a1f4b85ad;hpb=cdbd98f03337df0adf0acaa4712c29b0d903852a diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index f756d3596d..a944ea3653 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -x +set -xo pipefail # Space separated list of available testbeds, described by topology files TOPOLOGIES="topologies/available/lf_testbed1.yaml \ @@ -25,8 +25,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" -PYBOT_ARGS="-W 150 -L TRACE" - JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) JOB_ARCHIVE_DIR="archive" @@ -65,7 +63,7 @@ then VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" fi - cd .. + cd ${SCRIPT_DIR} # If we run this script from vpp project we want to use local build elif [[ ${JOB_NAME} == vpp-* ]] ; @@ -124,9 +122,8 @@ function cancel_all { # packages trap "cancel_all ${WORKING_TOPOLOGY}" EXIT -python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -t ${WORKING_TOPOLOGY} \ - -d ${INSTALLATION_DIR} \ - -p ${VPP_DEBS} +python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py \ + -t ${WORKING_TOPOLOGY} -d ${INSTALLATION_DIR} -p ${VPP_DEBS} if [ $? -eq 0 ]; then echo "VPP Installed on hosts from: ${WORKING_TOPOLOGY}" else @@ -134,219 +131,163 @@ else exit 1 fi +# Based on job we will identify DUT +if [[ ${JOB_NAME} == *hc2vpp* ]] ; +then + DUT="hc2vpp" +elif [[ ${JOB_NAME} == *vpp* ]] ; +then + DUT="vpp" +elif [[ ${JOB_NAME} == *ligato* ]] ; +then + DUT="kubernetes" +elif [[ ${JOB_NAME} == *dpdk* ]] ; +then + DUT="dpdk" +else + echo "Unable to identify dut type based on JOB_NAME variable: ${JOB_NAME}" + exit 1 +fi + +PYBOT_ARGS="--consolewidth 120 --loglevel TRACE --variable TOPOLOGY_PATH:${WORKING_TOPOLOGY} --suite tests.${DUT}.perf" + case "$TEST_TAG" in - # run specific performance tests based on jenkins job type variable + # select specific performance tests based on jenkins job type variable PERFTEST_DAILY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ - --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscANDnic_intel-x520-da2AND1t1c' + 'ndrdiscANDnic_intel-x520-da2AND2t2c' + 'ndrpdrANDnic_intel-x520-da2AND1t1c' + 'ndrpdrANDnic_intel-x520-da2AND2t2c' + 'ndrdiscAND1t1cANDipsec' + 'ndrdiscAND2t2cANDipsec') ;; PERFTEST_SEMI_WEEKLY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscANDnic_intel-x710AND1t1c' + 'ndrdiscANDnic_intel-x710AND2t2c' + 'ndrdiscANDnic_intel-xl710AND1t1c' + 'ndrdiscANDnic_intel-xl710AND2t2c') ;; PERFTEST_MRR_DAILY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include mrrAND64bAND1t1c \ - --include mrrAND64bAND2t2c \ - --include mrrAND64bAND4t4c \ - --include mrrAND78bAND1t1c \ - --include mrrAND78bAND2t2c \ - --include mrrAND78bAND4t4c \ - --include mrrANDimixAND1t1cANDvhost \ - --include mrrANDimixAND2t2cANDvhost \ - --include mrrANDimixAND4t4cANDvhost \ - --include mrrANDimixAND1t1cANDmemif \ - --include mrrANDimixAND2t2cANDmemif \ - --include mrrANDimixAND4t4cANDmemif \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrAND64bAND1t1c' + 'mrrAND64bAND2t2c' + 'mrrAND64bAND4t4c' + 'mrrAND78bAND1t1c' + 'mrrAND78bAND2t2c' + 'mrrAND78bAND4t4c' + 'mrrANDimixAND1t1cANDvhost' + 'mrrANDimixAND2t2cANDvhost' + 'mrrANDimixAND4t4cANDvhost' + 'mrrANDimixAND1t1cANDmemif' + 'mrrANDimixAND2t2cANDmemif' + 'mrrANDimixAND4t4cANDmemif') ;; VERIFY-PERF-NDRDISC ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscAND1t1cORndrdiscAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscAND1t1c' + 'ndrdiscAND2t2c') ;; VERIFY-PERF-PDRDISC ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrdiscAND1t1cORpdrdiscAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscAND1t1c' + 'pdrdiscAND2t2c') ;; VERIFY-PERF-MRR ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include mrrAND1t1cORmrrAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrAND1t1c' + 'mrrAND2t2c') ;; VERIFY-PERF-IP4 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') ;; VERIFY-PERF-IP6 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') ;; VERIFY-PERF-L2 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') + ETAGS=('lbond_dpdk') ;; VERIFY-PERF-LISP ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') ;; VERIFY-PERF-VXLAN ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VERIFY-PERF-VHOST ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') + ETAGS=('lbond_dpdk') ;; VERIFY-PERF-MEMIF ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' + 'pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif' + 'mrrANDnic_intel-x520-da2AND1t1cANDmemif' + 'mrrANDnic_intel-x520-da2AND2t2cANDmemif') ;; VERIFY-PERF-IPSECHW ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf.crypto" \ - --include ndrdiscANDnic_intel-xl710AND1t1cANDipsechw \ - --include ndrdiscANDnic_intel-xl710AND2t2cANDipsechw \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' + 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' + 'mrrANDnic_intel-xl710AND1t1cANDipsechw' + 'mrrANDnic_intel-xl710AND2t2cANDipsechw') + ;; + VERIFY-PERF-SRV6 ) + TAGS=('mrrANDsrv6AND1t1c' + 'mrrANDsrv6AND2t2c') ;; VPP-VERIFY-PERF-IP4 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include mrrANDnic_intel-x520-da2AND1t1cANDip4baseORmrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') ;; VPP-VERIFY-PERF-IP6 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include mrrANDnic_intel-x520-da2AND1t1cANDip6baseORmrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') ;; VPP-VERIFY-PERF-L2 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include mrrANDnic_intel-x520-da2AND1t1cANDl2xcbaseORmrrANDnic_intel-x520-da2AND1t1cANDl2bdbase \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase' + 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q') + ETAGS=('lbond_dpdk') ;; VPP-VERIFY-PERF-LISP ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') ;; VPP-VERIFY-PERF-VXLAN ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VPP-VERIFY-PERF-VHOST ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') + ETAGS=('lbond_dpdk') ;; VPP-VERIFY-PERF-MEMIF ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ - --include pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif \ - --include mrrANDnic_intel-x520-da2AND1t1cANDmemif \ - --include mrrANDnic_intel-x520-da2AND2t2cANDmemif \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' + 'pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif' + 'mrrANDnic_intel-x520-da2AND1t1cANDmemif' + 'mrrANDnic_intel-x520-da2AND2t2cANDmemif') ;; VPP-VERIFY-PERF-ACL ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ - --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDacl' + 'mrrANDnic_intel-x520-da2AND2t2cANDacl') ;; VPP-VERIFY-PERF-IPSECHW ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf.crypto" \ - --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \ - --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' + 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' + 'mrrANDnic_intel-xl710AND1t1cANDipsechw' + 'mrrANDnic_intel-xl710AND2t2cANDipsechw') + ;; + VPP-VERIFY-PERF-SRV6 ) + TAGS=('mrrANDsrv6AND1t1c' + 'mrrANDsrv6AND2t2c') ;; * ) - # run full performance test suite and exit on fail - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf" \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('perftest') esac +# Catenate TAG selections by 'OR' +if [[ ! -z "$TAGS" ]]; then printf -v INCLUDES " --include %s " "${TAGS[@]}"; fi +if [[ ! -z "$ETAGS" ]]; then printf -v EXCLUDES " --exclude %s " "${ETAGS[@]}"; fi + +# Execute the test +pybot ${PYBOT_ARGS}${INCLUDES}${EXCLUDES} tests/ +RETURN_STATUS=$(echo $?) + # Archive JOB artifacts in jenkins for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/