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_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
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}"
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
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 $?)
;;
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 $?)
VERIFY-PERF-NDRDISC )
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -s "tests.perf" \
+ -s "tests.vpp.perf" \
--include ndrdiscAND1t1cORndrdiscAND2t2c \
tests/
RETURN_STATUS=$(echo $?)
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 mrrAND1t1cORmrrAND2t2c \
tests/
RETURN_STATUS=$(echo $?)
;;
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 ndrchkANDnic_intel-x520-da2AND1t1cANDip4baseORndrchkANDnic_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 ndrchkANDnic_intel-x520-da2AND1t1cANDip6baseORndrchkANDnic_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 ndrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrchkANDnic_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" \
- --include ndrchkANDnic_intel-x520-da2AND1t1cANDlisp \
+ -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.perf" \
- --include ndrchkANDnic_intel-x520-da2AND1t1cANDvxlan \
+ -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.perf" \
- --include ndrchkANDnic_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 $?)
;;
# 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
# 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}
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
+mkdir -p archive
for i in ${ARCHIVE_ARTIFACTS[@]}; do
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done