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}"
#for DPDK test, we don't need to install the VPP deb
function cancel_all {
- python ${SCRIPT_DIR}/resources/tools/topo_reservation.py -c -t $1
+ python ${SCRIPT_DIR}/resources/tools/scripts/topo_reservation.py -c -t $1
}
# On script exit we cancel the reservation
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" \
+ -v DPDK_TEST:True \
+ -s "tests.dpdk.perf" \
--exclude SKIP_PATCH \
- -i perftest_long \
- dpdk-tests/
+ -i NDRPDRDISC \
+ tests/dpdk/
RETURN_STATUS=$(echo $?)
;;
PERFTEST_SHORT )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" \
- -i perftest_short \
- dpdk-tests/
- RETURN_STATUS=$(echo $?)
- ;;
- PERFTEST_NDR )
- pybot ${PYBOT_ARGS} \
- -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" -i NDR \
- dpdk-tests/
- RETURN_STATUS=$(echo $?)
- ;;
- PERFTEST_PDR )
- pybot ${PYBOT_ARGS} \
- -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" -i PDR \
- dpdk-tests/
+ -v DPDK_TEST:True \
+ -s "tests.dpdk.perf" \
+ -i NDRCHK \
+ tests/dpdk/
RETURN_STATUS=$(echo $?)
;;
PERFTEST_NIGHTLY )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" \
- dpdk-tests/
+ -v DPDK_TEST:True \
+ -s "tests.dpdk.perf" \
+ tests/dpdk/
RETURN_STATUS=$(echo $?)
;;
* )
pybot ${PYBOT_ARGS} \
-L TRACE \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True
- -s "dpdk-tests.perf" \
- dpdk-tests/
+ -v DPDK_TEST:True \
+ -s "tests.dpdk.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}
+ -o ${SCRIPT_DIR}/output_perf_data.xml
if [ ! $? -eq 0 ]; then
echo "Parsing ${SCRIPT_DIR}/output.xml failed"
fi