X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=98855a7be1dc8ea5576174f95b1cda4119e5b4a1;hp=044d746aec8cb1fd2ef34f5241846691f1f095e6;hb=f92c0509b068c8998653bb931f93d7d4720b71f1;hpb=8d71ac7c234226629a0d085f5f4dfaad3c4f2372 diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 044d746aec..98855a7be1 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 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: @@ -25,9 +25,14 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" -PYBOT_ARGS="-W 150" +PYBOT_ARGS="-W 150 -L TRACE" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; @@ -35,25 +40,25 @@ then mkdir vpp_download cd vpp_download - if [[ ${TEST_TAG} == "PERFTEST_NIGHTLY" ]] ; + if [[ ${TEST_TAG} == *DAILY ]] || \ + [[ ${TEST_TAG} == *WEEKLY ]]; then # Download the latest VPP build .deb install packages echo Downloading VPP packages... - bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install + bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh --skip-install VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" # Take vpp package and get the vpp version VPP_STABLE_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )" else - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER) - VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL) - VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER) + DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)_amd64 + VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_UBUNTU) + VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_UBUNTU) VPP_CLASSIFIER="-deb" # Download vpp build from nexus and set VPP_DEBS variable wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${DPDK_STABLE_VER}/vpp-dpdk-dev-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-plugins/${VPP_STABLE_VER}/vpp-plugins-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit @@ -91,7 +96,7 @@ pip install -r requirements.txt while :; do for TOPOLOGY in ${TOPOLOGIES}; do - python ${SCRIPT_DIR}/resources/tools/topo_reservation.py -t ${TOPOLOGY} + python ${SCRIPT_DIR}/resources/tools/scripts/topo_reservation.py -t ${TOPOLOGY} if [ $? -eq 0 ]; then WORKING_TOPOLOGY=${TOPOLOGY} echo "Reserved: ${WORKING_TOPOLOGY}" @@ -111,15 +116,15 @@ while :; do done function cancel_all { - python ${SCRIPT_DIR}/resources/tools/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1 - python ${SCRIPT_DIR}/resources/tools/topo_reservation.py -c -t $1 + python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -c -d ${INSTALLATION_DIR} -t $1 + python ${SCRIPT_DIR}/resources/tools/scripts/topo_reservation.py -c -t $1 } # On script exit we cancel the reservation and installation and delete all vpp # packages trap "cancel_all ${WORKING_TOPOLOGY}" EXIT -python ${SCRIPT_DIR}/resources/tools/topo_installation.py -t ${WORKING_TOPOLOGY} \ +python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py -t ${WORKING_TOPOLOGY} \ -d ${INSTALLATION_DIR} \ -p ${VPP_DEBS} if [ $? -eq 0 ]; then @@ -131,61 +136,228 @@ fi case "$TEST_TAG" in # run specific performance tests based on jenkins job type variable - PERFTEST_LONG ) + PERFTEST_DAILY ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --exclude SKIP_PATCH \ - -i NDRPDRDISC \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ + --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_SHORT ) + PERFTEST_SEMI_WEEKLY ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - -i NDRCHK \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NIGHTLY ) - #run all available tests + PERFTEST_MRR_DAILY ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -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 $?) + ;; + VERIFY-PERF-NDRDISC ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include ndrdiscAND1t1cORndrdiscAND2t2c \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-PDRDISC ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include pdrdiscAND1t1cORpdrdiscAND2t2c \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-MRR ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include mrrAND1t1cORmrrAND2t2c \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + VERIFY-PERF-LISP ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-VXLAN ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-VHOST ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-MEMIF ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-IPSECHW ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf.crypto" \ + --include ndrdiscANDnic_intel-xl710AND1t1cANDipsechw \ + --include ndrdiscANDnic_intel-xl710AND2t2cANDipsechw \ + --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ + --include mrrANDnic_intel-xl710AND2t2cANDipsechw \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 $?) + ;; + 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 \ + --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ + --include mrrANDnic_intel-xl710AND2t2cANDipsechw \ tests/ RETURN_STATUS=$(echo $?) ;; * ) # run full performance test suite and exit on fail pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ tests/ RETURN_STATUS=$(echo $?) esac -# Pybot output post-processing -echo Post-processing test data... - -python ${SCRIPT_DIR}/resources/tools/robot_output_parser.py \ - -i ${SCRIPT_DIR}/output.xml \ - -o ${SCRIPT_DIR}/output_perf_data.xml \ - -v ${VPP_STABLE_VER} -if [ ! $? -eq 0 ]; then - echo "Parsing ${SCRIPT_DIR}/output.xml failed" -fi - -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done - -echo Post-processing finished. exit ${RETURN_STATUS}