aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2017-07-13 14:42:38 +0200
committerPeter Mikus <pmikus@cisco.com>2017-07-14 12:21:06 +0000
commitd9a08e59581aafe44d446b5bc1ce6ff86b2b173b (patch)
tree74902d592577616d7d5c1a115a42ef02d7139b67 /resources/tools
parentd6226b0df6d07f886184a5d35ff647dbdfe5d4ce (diff)
CSIT-618 CSIT rls1707 Report - Update I
Change-Id: I7c3af55db6cc89f03004db6ddf6fcf67965132a7 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/report_gen/conf.py11
-rwxr-xr-xresources/tools/report_gen/run_report.sh107
2 files changed, 66 insertions, 52 deletions
diff --git a/resources/tools/report_gen/conf.py b/resources/tools/report_gen/conf.py
index 4c90e55ddf..93f39024c6 100644
--- a/resources/tools/report_gen/conf.py
+++ b/resources/tools/report_gen/conf.py
@@ -69,14 +69,17 @@ rst_epilog = """
.. _tag documentation rst file: https://git.fd.io/csit/tree/docs/tag_documentation.rst?h=rls1707
.. _TRex intallation: https://git.fd.io/csit/tree/resources/tools/trex/trex_installer.sh?h=rls1707
.. _TRex driver: https://git.fd.io/csit/tree/resources/tools/trex/trex_stateless_profile.py?h=rls1707
-.. _CSIT Honeycomb Functional Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.func.html
-.. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.perf.html
-.. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.func.html
-.. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.perf.html
+.. _CSIT Honeycomb Functional Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.vpp.func.html
+.. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.dpdk.perf.html
+.. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.vpp.func.html
+.. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.vpp.perf.html
+.. _CSIT NSH_SFC Functional Tests Documentation: https://docs.fd.io/csit/rls1707/doc/tests.nsh_sfc.func.html
.. _VPP test framework documentation: https://docs.fd.io/vpp/17.07/vpp_make_test/html/
.. _FD.io test executor vpp performance jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-1707-all
.. _FD.io test executor dpdk performance jobs: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-1707-all
.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-1707-ubuntu1604/
+.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-1707-ubuntu1604/
+.. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h=rls1707
"""
# The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/resources/tools/report_gen/run_report.sh b/resources/tools/report_gen/run_report.sh
index e11c68e8ee..494ec5650a 100755
--- a/resources/tools/report_gen/run_report.sh
+++ b/resources/tools/report_gen/run_report.sh
@@ -41,18 +41,18 @@ sudo apt-get -y update
sudo apt-get -y install libxml2 libxml2-dev libxslt-dev build-essential \
zlib1g-dev unzip
-# Clean-up when finished:
+# Clean-up when finished
trap 'rm -rf ${WORKING_DIR}; exit' EXIT
trap 'rm -rf ${WORKING_DIR}; exit' ERR
-# Remove the old build:
+# Remove the old build
rm -rf ${BUILD_DIR} || true
rm -rf ${WORKING_DIR} || true
# Create working directories
mkdir ${BUILD_DIR}
-# Create virtual environment:
+# Create virtual environment
virtualenv ${WORKING_DIR}/env
. ${WORKING_DIR}/env/bin/activate
@@ -72,22 +72,23 @@ mkdir -p ${PLOT_DPDK_SOURCE_DIR}
### VPP PERFORMANCE SOURCE DATA
JEN_FILE_PERF='output_perf_data.xml'
-JEN_JOB='csit-vpp-perf-1704-all'
-JEN_BUILD=(6 7 8 9 10 12 14 15 16 17)
+JEN_JOB='csit-vpp-perf-master-all'
+JEN_BUILD=(1567)
+JEN_FBUILD=1567
for i in "${JEN_BUILD[@]}"; do
curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/output_perf_data.xml \
-o ${PLOT_VPP_SOURCE_DIR}/${JEN_JOB}-${i}.xml
if [[ ${DEBUG} -eq 1 ]] ;
then
- cp ./${JEN_JOB}-10.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-10.zip
+ cp ./${JEN_JOB}-${JEN_FBUILD}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_FBUILD}.zip
else
curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/\*zip\*/robot-plugin.zip \
-o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
fi
done
-unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-10.zip -d ${WORKING_DIR}/
+unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_FBUILD}.zip -d ${WORKING_DIR}/
python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
--output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results.rst \
--formatting rst --start 4 --level 2
@@ -97,48 +98,52 @@ python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
-o ${DTO_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data.rst \
--data "SH_RUN" -f "rst" --start 4 --level 2
-sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
- ${DTR_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@g" \
- ${DTR_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
- ${DTC_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@g" \
- ${DTC_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
- ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@g" \
- ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
+if [[ ${DEBUG} -eq 0 ]] ;
+then
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTR_PERF_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTR_PERF_SOURCE_DIR}/index.rst
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTC_PERF_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTC_PERF_SOURCE_DIR}/index.rst
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_FBUILD}@g" \
+ ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
+fi
### DPDK PERFORMANCE SOURCE DATA
-JEN_JOB='csit-dpdk-perf-master-all'
-JEN_BUILD=(13 14 15 16)
+JEN_JOB='csit-dpdk-perf-1707-all'
+JEN_BUILD=(1 2 3 4)
for i in "${JEN_BUILD[@]}"; do
curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/output_perf_data.xml \
-o ${PLOT_DPDK_SOURCE_DIR}/${JEN_JOB}-${i}.xml
if [[ ${DEBUG} -eq 1 ]] ;
then
- cp ./${JEN_JOB}-16.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-16.zip
+ cp ./${JEN_JOB}-${JEN_BUILD[-1]}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip
else
curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/\*zip\*/robot-plugin.zip \
-o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
+
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+ ${DTR_DPDK_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+ ${DTR_DPDK_SOURCE_DIR}/index.rst
fi
done
-unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-16.zip -d ${WORKING_DIR}/
+unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip -d ${WORKING_DIR}/
python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
--output ${DTR_DPDK_SOURCE_DIR}/dpdk_performance_results.rst \
- --formatting rst --start 3 --level 2
-sed -i -e "s@###JOB###@${JEN_JOB}\/16@g" \
- ${DTR_DPDK_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/16@g" \
- ${DTR_DPDK_SOURCE_DIR}/index.rst
+ --formatting rst --start 4 --level 2
### FUNCTIONAL SOURCE DATA
-JEN_JOB='csit-vpp-functional-master-ubuntu1604-virl'
+JEN_JOB='csit-vpp-functional-1707-ubuntu1604-virl'
JEN_BUILD='lastSuccessfulBuild'
if [[ ${DEBUG} -eq 1 ]] ;
@@ -147,6 +152,15 @@ then
else
curl -fs ${CSIT_JEN_URL}/${JEN_JOB}/${JEN_BUILD}/robot/report/\*zip\*/robot-plugin.zip \
-o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTR_FUNC_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTR_FUNC_SOURCE_DIR}/index.rst
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTC_FUNC_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTC_FUNC_SOURCE_DIR}/index.rst
fi
unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip -d ${WORKING_DIR}/
@@ -156,18 +170,10 @@ python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
--output ${DTC_FUNC_SOURCE_DIR}/vpp_functional_configuration.rst \
--data "VAT_H" -f "rst" --start 5 --level 2
-sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTR_FUNC_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTR_FUNC_SOURCE_DIR}/index.rst
-sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTC_FUNC_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTC_FUNC_SOURCE_DIR}/index.rst
### HONEYCOMB SOURCE DATA
-JEN_JOB='hc2vpp-csit-integration-master-ubuntu1604'
+JEN_JOB='hc2vpp-csit-integration-1707-ubuntu1604'
JEN_BUILD='lastSuccessfulBuild'
if [[ ${DEBUG} -eq 1 ]] ;
@@ -176,21 +182,22 @@ then
else
curl -fs ${HC_JEN_URL}/${JEN_JOB}/${JEN_BUILD}/robot/report/\*zip\*/robot-plugin.zip \
-o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+
+ sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
+ sed -i -e "s@###LINK###@${HC_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
+ ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
fi
unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip -d ${WORKING_DIR}/
python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
--output ${DTR_HONEYCOMB_SOURCE_DIR}/honeycomb_functional_results.rst \
- --formatting rst --start 3 --level 2
-sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${HC_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
- ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
+ --formatting rst --start 5 --level 2
# Delete temporary json files
find ${SOURCE_DIR} -name "*.json" -type f -delete
-# Generate the documentation:
+# Generate the documentation
DATE=$(date -u '+%d-%b-%Y')
@@ -354,11 +361,13 @@ python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
--output ${STATIC_DIR_DPDK}/64B-1t1c-ipv4-ndrdisc \
--title "64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc" \
- --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]'
+ --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]' \
+ --lower 2000000 --upper 12000000
python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
--output ${STATIC_DIR_DPDK}/64B-2t2c-ipv4-ndrdisc \
--title "64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc" \
- --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]'
+ --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]' \
+ --lower 2000000 --upper 12000000
python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
--output ${STATIC_DIR_DPDK}/64B-1t1c-l2-pdrdisc \
@@ -371,11 +380,13 @@ python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
--output ${STATIC_DIR_DPDK}/64B-1t1c-ipv4-pdrdisc \
--title "64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc" \
- --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]'
+ --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]' \
+ --lower 20000000 --upper 30000000
python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
--output ${STATIC_DIR_DPDK}/64B-2t2c-ipv4-pdrdisc \
--title "64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc" \
- --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]'
+ --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]' \
+ --lower 20000000 --upper 30000000
# Plot latency