X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-DPDK.sh;h=10989fbd9b0980a81392843fd85c0255b057d34f;hp=4ad3824aba9c98c1ec6a549c497471593cf96a41;hb=4c50519591b1bf73ca617a595b2b03f56edc4c01;hpb=bfa305de45a6c9ef9a20b08b013699c2832a71ae

diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index 4ad3824aba..10989fbd9b 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -24,7 +24,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
 
-PYBOT_ARGS="-W 150"
+PYBOT_ARGS=""
 
 ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
 
@@ -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
@@ -80,10 +80,10 @@ case "$TEST_TAG" in
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -v DPDK_TEST:True \
-              -s "dpdk-tests.perf" \
+              -s "tests.dpdk.perf" \
               --exclude SKIP_PATCH \
               -i NDRPDRDISC \
-              dpdk-tests/
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_SHORT )
@@ -91,9 +91,9 @@ case "$TEST_TAG" in
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -v DPDK_TEST:True \
-              -s "dpdk-tests.perf" \
+              -s "tests.dpdk.perf" \
               -i NDRCHK \
-              dpdk-tests/
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
    PERFTEST_NIGHTLY )
@@ -102,8 +102,8 @@ case "$TEST_TAG" in
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -v DPDK_TEST:True \
-              -s "dpdk-tests.perf" \
-              dpdk-tests/
+              -s "tests.dpdk.perf" \
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
     * )
@@ -112,15 +112,15 @@ case "$TEST_TAG" in
               -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -v DPDK_TEST:True \
-              -s "dpdk-tests.perf" \
-              dpdk-tests/
+              -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
 if [ ! $? -eq 0 ]; then