diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-vsperf.sh | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh index 38fda03b..24fbb8fa 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -67,7 +67,7 @@ TEST_REPORT_PARTIAL="*_test_report.rst" TEST_REPORT_DIR="${WORKSPACE}/docs/results" TEST_REPORT_INDEX="${TEST_REPORT_DIR}/index.rst" TEST_REPORT_LINK_OLD="https://wiki.opnfv.org/wiki/vsperf_results" -TEST_REPORT_FILE="${WORKSPACE}/docs_output/results/results.pdf" +TEST_REPORT_FILE="${WORKSPACE}/docs_output/results/index.html" TEST_REPORT_TARBALL="vswitchperf_logs_${DATE}.tar.gz" if [[ "x${BRANCH}" == "xmaster" ]]; then @@ -170,8 +170,10 @@ function execute_vsperf() { LOG_SUBDIR="OvsDpdkVhost" LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log" + hugepages_info > $LOG_FILE echo " $VSPERF_BIN $OPNFVPOD --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE" - $VSPERF_BIN $OPNFVPOD --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES &> $LOG_FILE + $VSPERF_BIN $OPNFVPOD --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES &>> $LOG_FILE + hugepages_info >> $LOG_FILE ;; esac @@ -239,9 +241,9 @@ function generate_report() { sed -ie 's,python ,python2 ,g' ./opnfvdocs/scripts/docs-build.sh OPNFVDOCS_DIR='./opnfvdocs' ./opnfvdocs/scripts/docs-build.sh &> /dev/null - # store PDF with test results into dedicated directory + # store HTML report with test results into dedicated directory if [ -f $TEST_REPORT_FILE ] ; then - cp -a $TEST_REPORT_FILE $TEST_REPORT_LOG_DIR + cp -ar $TEST_REPORT_FILE $(dirname $TEST_REPORT_FILE)/_static $TEST_REPORT_LOG_DIR echo "Final test report has been created." else echo "FAILURE: Generation of final test report has failed." @@ -319,7 +321,7 @@ function dependencies_check() { if [ $ID == "ubuntu" ] ; then echo "Dependencies check" echo "==================" - for PACKAGE in "python3-tk" ; do + for PACKAGE in "python3-tk" "sysstat" ; do if dpkg -s $PACKAGE &> /dev/null ; then printf " %-70s %-6s\n" $PACKAGE "OK" else @@ -331,6 +333,19 @@ function dependencies_check() { fi } +# configure hugepages +function configure_hugepages() { + sudo bash -c "echo 2048 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages" + sudo bash -c "echo 0 > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages" +} + +# dump hugepages configuration +function hugepages_info() { + echo "-------------------------------------------------------------------" + head /sys/devices/system/node/node*/hugepages/hugepages*/* + echo "-------------------------------------------------------------------" +} + # # main # @@ -361,6 +376,9 @@ dependencies_check # initialization initialize_logdir +# configure hugepages +configure_hugepages + # execute job based on passed parameter case $1 in "verify") |