summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/ci/yardstick-verify5
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml1
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml5
-rw-r--r--yardstick/benchmark/scenarios/networking/networkcapacity.bash2
5 files changed, 7 insertions, 8 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 37d0a9036..16df3bb59 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -295,17 +295,16 @@ 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}\",
+ \"version\":\"$(basename ${YARDSTICK_BRANCH})\",
\"scenario\":\"${DEPLOY_SCENARIO}\",
\"description\": \"yardstick ci scenario status\",
- \"start_date\":\"$2\",
\"criteria\":\"$1\",
+ \"start_date\":\"$2\",
\"stop_date\":\"$3\",
\"details\":\"\"}" \
${DISPATCHER_HTTP_TARGET}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
index 1942bb54f..93d6ac018 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
@@ -24,7 +24,7 @@ scenarios:
context:
name: demo
image: cirros-0.3.3
- flavor: m1.tiny
+ flavor: yardstick-flavor
user: cirros
placement_groups:
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