X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-semiweekly.sh;h=a2da6d3a2f33e9ab71ed3b9abae829a99f590e8b;hp=c62d1ddd50d49fd58ed0c1943a9002e029844360;hb=8825ed229f1d1fbd12d0cec0a128f42f22ae11fe;hpb=f08e8cf324861a754388a063fbaaf4e33f10d480

diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index c62d1ddd50..a2da6d3a2f 100644
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -27,7 +27,7 @@ sudo apt-get -y install libpython2.7-dev python-virtualenv
 
 PYBOT_ARGS="--noncritical MULTI_THREAD"
 
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.json)
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
@@ -247,6 +247,7 @@ do
 
     pybot -L TRACE \
         -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
+        --suite "tests.func" \
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
@@ -340,6 +341,7 @@ echo Performance tests on HW system
 pybot ${PYBOT_ARGS} \
     -L TRACE \
     -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
+    --suite "tests.perf" \
     --include perftest_long \
     --output log_perf_test_set \
     tests/
@@ -404,15 +406,17 @@ echo Post-processing test data...
 # Getting JSON perf data output
 python ${SCRIPT_DIR}/resources/tools/robot_output_parser.py \
        -i ${SCRIPT_DIR}/log_perf_test_set.xml \
-       -o ${SCRIPT_DIR}/output_perf_data.json \
+       -o ${SCRIPT_DIR}/output_perf_data.xml \
        -v ${VPP_VER}
 if [ ! $? -eq 0 ]; then
     echo "Parsing ${SCRIPT_DIR}/log_perf_test_set.xml failed"
 fi
 
 # Rebot output post-processing
-rebot --output output.xml ./log_func_test_set1.xml ./log_func_test_set2.xml \
-    ./log_func_test_set3.xml ./log_perf_test_set.xml
+rebot --noncritical EXPECTED_FAILING \
+      --output output.xml \
+      ./log_func_test_set1.xml ./log_func_test_set2.xml \
+      ./log_func_test_set3.xml ./log_perf_test_set.xml
 
 # Remove unnecessary files
 rm -f ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml \