X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-DPDK.sh;h=1b8a88525823f4f83a8602321cd658187338e471;hp=c8b3dba53c8bae27aa8b3da55930dc06f5d9c3c1;hb=d166ae0881c29dfd05ed61b9a12156f17981bb6d;hpb=286c2d8ef60de3c22f57cc71198edcb9f7bc7a3f

diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index c8b3dba53c..1b8a885258 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -46,7 +46,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}"
@@ -67,7 +67,7 @@ done
 
 #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
@@ -79,39 +79,21 @@ case "$TEST_TAG" in
         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 )
@@ -119,9 +101,9 @@ case "$TEST_TAG" in
         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 $?)
         ;;
     * )
@@ -129,19 +111,18 @@ case "$TEST_TAG" in
         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