X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=e41b575fbc7d2d5a7608c2a18198b049cc949604;hp=67986b8531e4ff61f08a7a2babb9dd0c344939fe;hb=16d26b1280d64f046838baefbe642f7fd5d853a8;hpb=81d487b1bd85d106ed6c26116ab7ec5f3f3a0f53 diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 67986b8531..e41b575fbc 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -27,7 +27,10 @@ INSTALLATION_DIR="/tmp/install_dir" PYBOT_ARGS="-W 150 -L TRACE" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml output_perf_data.json) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml) +LOG_ARCHIVE_ARTIFACTS=(output.xml) +LOG_ARCHIVES_DIR="$WORKSPACE/archives" +mkdir -p ${LOG_ARCHIVES_DIR} # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; @@ -35,13 +38,12 @@ then mkdir vpp_download cd vpp_download - if [[ ${TEST_TAG} == *NIGHTLY ]] || \ - [[ ${TEST_TAG} == *DAILY ]] || \ + 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 @@ -71,12 +73,6 @@ then VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )" # Take vpp package and get the vpp version VPP_STABLE_VER="$( expr match $1 'vpp-\(.*\)-deb.deb' )" - # Download DPDK parts not included in dpdk plugin of vpp build - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)_amd64 - VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_UBUNTU) - VPP_CLASSIFIER="-deb" - wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - VPP_DEBS+=($( readlink -f vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb )) else echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" exit 1 @@ -98,7 +94,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}" @@ -118,15 +114,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 @@ -141,23 +137,30 @@ case "$TEST_TAG" in PERFTEST_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ + --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \ tests/ RETURN_STATUS=$(echo $?) + for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log + done ;; PERFTEST_SEMI_WEEKLY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) + for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log + done ;; VERIFY-PERF-NDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -165,31 +168,36 @@ case "$TEST_TAG" in VERIFY-PERF-PDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - VERIFY-PERF-NDRCHK ) + VERIFY-PERF-MRR ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + -s "tests.vpp.perf" \ + --include mrrAND1t1cORmrrAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NDRCHK_DAILY ) + PERFTEST_MRR_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + -s "tests.vpp.perf" \ + --include mrrAND64bAND1t1c \ + --include mrrAND64bAND2t2c \ + --include mrrAND64bAND4t4c \ tests/ RETURN_STATUS=$(echo $?) + for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log + done ;; VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -197,7 +205,7 @@ case "$TEST_TAG" in VERIFY-PERF-IP6 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -205,7 +213,7 @@ case "$TEST_TAG" in VERIFY-PERF-L2 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -213,7 +221,7 @@ case "$TEST_TAG" in VERIFY-PERF-LISP ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -221,7 +229,7 @@ case "$TEST_TAG" in VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -229,39 +237,55 @@ case "$TEST_TAG" in VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -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 \ + tests/ + ;; VPP-VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ + -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.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ + -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.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchkANDnic_intel-x520-da2AND1t1cANDl2bdbase \ + -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.perf" \ + -s "tests.vpp.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -269,7 +293,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -277,33 +301,54 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDvhost \ + -s "tests.vpp.perf" \ + --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG ) + VPP-VERIFY-PERF-MEMIF ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ - --exclude SKIP_PATCH \ - -i NDRPDRDISC \ + -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 $?) ;; - PERFTEST_SHORT ) + 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.perf" \ - -i NDRCHK \ + -s "tests.vpp.perf.crypto" \ + --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \ + --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NIGHTLY ) - #run all available tests + PERFTEST_LONG ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ + --exclude SKIP_PATCH \ + -i NDRPDRDISC \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + PERFTEST_SHORT ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.vpp.perf" \ + -i MRR \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -311,7 +356,7 @@ case "$TEST_TAG" in # run full performance test suite and exit on fail pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" \ + -s "tests.vpp.perf" \ tests/ RETURN_STATUS=$(echo $?) esac @@ -319,7 +364,7 @@ esac # Pybot output post-processing echo Post-processing test data... -python ${SCRIPT_DIR}/resources/tools/robot_output_parser.py \ +python ${SCRIPT_DIR}/resources/tools/scripts/robot_output_parser.py \ -i ${SCRIPT_DIR}/output.xml \ -o ${SCRIPT_DIR}/output_perf_data.xml \ -v ${VPP_STABLE_VER} @@ -327,17 +372,9 @@ if [ ! $? -eq 0 ]; then echo "Parsing ${SCRIPT_DIR}/output.xml failed" fi -python ${SCRIPT_DIR}/resources/tools/report_gen/run_robot_json_data.py \ - --input ${SCRIPT_DIR}/output.xml \ - --output ${SCRIPT_DIR}/output_perf_data.json \ - --vdevice ${VPP_STABLE_VER} -if [ ! $? -eq 0 ]; then - echo "Generating JSON data for report from ${SCRIPT_DIR}/output.xml failed" -fi - # Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do +mkdir -p archive +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ done