X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=91d3e7c8c573280109e1eaa02ffbb2a075a81b20;hp=0442464f1ebd0d79541321eaf146dfdb2dd8640a;hb=bc2036f4ce9b8aa705161ee1c8566b134fc6570c;hpb=46227f82fd1ea0c3532d4338fd6dbb8f7cb5de77 diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 0442464f1e..91d3e7c8c5 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) 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: @@ -25,7 +25,7 @@ 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) @@ -45,15 +45,15 @@ then # Take vpp package and get the vpp version VPP_STABLE_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )" else - 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/${VPP_STABLE_VER}/vpp-dpdk-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${VPP_STABLE_VER}/vpp-dpdk-dkms-${VPP_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 VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" @@ -69,6 +69,12 @@ 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 @@ -130,84 +136,74 @@ 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 perftest_long \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_SHORT ) + PERFTEST_SEMI_WEEKLY ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.perf" \ - -i perftest_short \ + --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG_BRIDGE ) + VERIFY-PERF-NDRDISC ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf.Long_Bridge_Domain*" \ + -s "tests.perf" \ + --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG_IPV4 ) + VERIFY-PERF-PDRDISC ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf.Long_IPv4*" \ + -s "tests.perf" \ + --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG_IPV6 ) + VERIFY-PERF-NDRCHK ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf.Long_IPv6*" \ + -s "tests.perf" \ + --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG_XCONNECT ) + PERFTEST_NDRCHK_DAILY ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf.Long_Xconnect*" \ + -s "tests.perf" \ + --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_LONG_XCONNECT_DOT1Q ) - pybot ${PYBOT_ARGS} \ - -L TRACE \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf.Long_Xconnect_Dot1q*" \ - RETURN_STATUS=$(echo $?) - ;; - PERFTEST_NDR ) + PERFTEST_LONG ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" -i NDR \ + -s "tests.perf" \ + --exclude SKIP_PATCH \ + -i NDRPDRDISC \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_PDR ) + PERFTEST_SHORT ) pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.perf" -i PDR \ + -s "tests.perf" \ + -i NDRCHK \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NIGHTLY ) + PERFTEST_NIGHTLY ) #run all available tests pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.perf" \ tests/ @@ -216,7 +212,6 @@ case "$TEST_TAG" in * ) # run full performance test suite and exit on fail pybot ${PYBOT_ARGS} \ - -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "tests.perf" \ tests/