aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap-verify-perf-DPDK.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap-verify-perf-DPDK.sh')
-rwxr-xr-xbootstrap-verify-perf-DPDK.sh41
1 files changed, 13 insertions, 28 deletions
diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index 10989fbd9b..4d53c68c39 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -26,7 +26,12 @@ RESERVATION_DIR="/tmp/reservation_dir"
PYBOT_ARGS=""
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
+JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+JOB_ARCHIVE_DIR="archive"
+LOG_ARCHIVE_DIR="$WORKSPACE/archives"
+mkdir -p ${JOB_ARCHIVE_DIR}
+mkdir -p ${LOG_ARCHIVE_DIR}
# we will download the DPDK in the robot
@@ -75,17 +80,6 @@ trap "cancel_all ${WORKING_TOPOLOGY}" EXIT
case "$TEST_TAG" in
# run specific performance tests based on jenkins job type variable
- PERFTEST_LONG )
- pybot ${PYBOT_ARGS} \
- -L TRACE \
- -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
- -v DPDK_TEST:True \
- -s "tests.dpdk.perf" \
- --exclude SKIP_PATCH \
- -i NDRPDRDISC \
- tests/
- RETURN_STATUS=$(echo $?)
- ;;
PERFTEST_SHORT )
pybot ${PYBOT_ARGS} \
-L TRACE \
@@ -117,22 +111,13 @@ case "$TEST_TAG" in
RETURN_STATUS=$(echo $?)
esac
-# Pybot output post-processing
-echo Post-processing test data...
-
-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
- echo "Parsing ${SCRIPT_DIR}/output.xml failed"
-fi
-
-# Archive artifacts
-mkdir archive
-for i in ${ARCHIVE_ARTIFACTS[@]}; do
- cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+# Archive JOB artifacts in jenkins
+for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/
+done
+# Archive JOB artifacts to logs.fd.io
+for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/
done
-
-echo Post-processing finished.
exit ${RETURN_STATUS}