diff options
| -rwxr-xr-x | tests/ci/yardstick-verify | 37 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml | 1 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml | 5 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/networkcapacity.bash | 2 |
4 files changed, 27 insertions, 18 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 859c92c94..4b5add71a 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -252,6 +252,26 @@ load_yardstick_image() echo "Glance image id: $GLANCE_IMAGE_ID" } +report(){ + + echo + echo "========== Reporting Status ==========" + + curl -i -H 'content-type: application/json' -X POST -d \ + "{\"project_name\": \"yardstick\", + \"case_name\": \"scenario_status\", + \"pod_name\":\"${NODE_NAME}\", + \"installer\":\"${INSTALLER_TYPE}\", + \"version\":\"${YARDSTICK_BRANCH}\", + \"scenario\":\"${DEPLOY_SCENARIO}\", + \"description\": \"yardstick ci scenario status\", + \"start_date\":\"$2\", + \"criteria\":\"$1\", + \"stop_date\":\"$3\", + \"details\":\"\"}" \ + ${DISPATCHER_HTTP_TARGET} +} + run_test() { echo @@ -296,7 +316,7 @@ EOF # Mark the test suite failed but continue # running the remaining test suites. - (( failed++ )) + (( ++failed )) fi if [ ${DISPATCHER_TYPE} = file ]; then echo "---------------------------" @@ -318,19 +338,8 @@ EOF if [ $failed -gt 0 ]; then scenario_status="FAILED" fi - curl -i -H 'content-type: application/json' -X POST -d \ - "{\"project_name\": \"yardstick\", - \"case_name\": \"scenario_status\", - \"pod_name\":\"${NODE_NAME}\", - \"installer\":\"${INSTALLER_TYPE}\", - \"version\":\"${YARDSTICK_BRANCH}\", - \"scenario\":\"${DEPLOY_SCENARIO}\", - \"description\": \"yardstick ci scenario status\", - \"start_date\":\"${start_date}\", - \"criteria\":\"${scenario_status}\", - \"stop_date\":\"${stop_date}\", - \"details\":\"\"}" \ - ${DISPATCHER_HTTP_TARGET} + + report $scenario_status $start_date $stop_date if [ $failed -gt 0 ]; then echo "---------------------------" diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml index b43e56665..403bc344e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml @@ -1,6 +1,7 @@ --- # Yardstick TC055 config file # Collect hardware specification from /proc/cpuinfo +# Measure number of cores, number of threads, available memory size and cache size schema: "yardstick:task:0.1" {% set host = host or "node5.yardstick-TC055" %} diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml index d4a978c1d..fb5a12e8a 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml @@ -1,8 +1,7 @@ --- # Yardstick TC075 config file -# Measure compute capacity and scale. -# Including number of cores, number of threads, available memory size and -# cache size. +# Measure network capacity and scale. +# Measure number of connections, number of frames received schema: "yardstick:task:0.1" {% set host = host or "node1.LF" %} diff --git a/yardstick/benchmark/scenarios/networking/networkcapacity.bash b/yardstick/benchmark/scenarios/networking/networkcapacity.bash index a18f97e0b..e2d3eb745 100644 --- a/yardstick/benchmark/scenarios/networking/networkcapacity.bash +++ b/yardstick/benchmark/scenarios/networking/networkcapacity.bash @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# Measure compute capacity and scale of a host +# Measure network capacity and scale of a host set -e OUTPUT_FILE=/tmp/netperf-out.log |