summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuraj.linkes <jlinkes@cisco.com>2016-09-16 15:59:28 +0200
committerjuraj.linkes <jlinkes@cisco.com>2016-09-19 16:29:35 +0200
commita85d844d13ef461830bd66cc96e8c7454bd867f6 (patch)
treecdd32cf4f2c9f757e4cd0b99ab80206ee0cb0f86
parentd38d993ec1515cade15372592cd33becb810c67a (diff)
Added opnfv_os-odl_l2-fdio-noha_daily.yaml and opnfv_os-nosdn-fdio-noha_daily.yaml scenarios along with support for hugepages which is needed for these scenarios
JIRA: YARDSTICK-347 Change-Id: Ie4840b328393488fb8e118c3f2cd610d61fdc283 Signed-off-by: juraj.linkes <jlinkes@cisco.com>
-rwxr-xr-xtests/ci/yardstick-verify23
-rw-r--r--tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml30
-rw-r--r--tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml30
3 files changed, 83 insertions, 0 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 16df3bb59..77a560c71 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -185,6 +185,10 @@ create_nova_flavor()
if [[ "$DEPLOY_SCENARIO" == *"-ovs-"* ]]; then
nova flavor-key yardstick-flavor set hw:mem_page_size=large
fi
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ nova flavor-key yardstick-flavor set hw:mem_page_size=large
+ fi
fi
}
@@ -195,10 +199,17 @@ load_cirros_image()
local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
+ EXTRA_PARAMS=""
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(glance image-create \
--name cirros-0.3.3 \
--disk-format $DISK_FORMAT \
--container-format bare \
+ $EXTRA_PARAMS \
--file $image_file)
echo "$output"
@@ -218,10 +229,17 @@ load_ubuntu_image()
local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img
+ EXTRA_PARAMS=""
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(glance image-create \
--name Ubuntu-14.04 \
--disk-format qcow2 \
--container-format bare \
+ $EXTRA_PARAMS \
--file $ubuntu_image_file)
echo "$output"
@@ -270,6 +288,11 @@ load_yardstick_image()
cd $YARDSTICK_REPO_DIR
fi
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(eval glance --os-image-api-version 1 image-create \
--name yardstick-trusty-server \
--is-public true --disk-format $DISK_FORMAT \
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml
new file mode 100644
index 000000000..187e10988
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml
@@ -0,0 +1,30 @@
+---
+# FDS suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-nosdn-fdio-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+ file_name: opnfv_yardstick_tc001.yaml
+-
+ file_name: opnfv_yardstick_tc002.yaml
+-
+ file_name: opnfv_yardstick_tc006.yaml
+-
+ file_name: opnfv_yardstick_tc007.yaml
+-
+ file_name: opnfv_yardstick_tc008.yaml
+-
+ file_name: opnfv_yardstick_tc009.yaml
+-
+ file_name: opnfv_yardstick_tc011.yaml
+-
+ file_name: opnfv_yardstick_tc020.yaml
+-
+ file_name: opnfv_yardstick_tc021.yaml
+-
+ file_name: opnfv_yardstick_tc037.yaml
+-
+ file_name: opnfv_yardstick_tc038.yaml
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml
new file mode 100644
index 000000000..3b7fe80e5
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml
@@ -0,0 +1,30 @@
+---
+# FDS suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-odl_l2-fdio-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+ file_name: opnfv_yardstick_tc001.yaml
+-
+ file_name: opnfv_yardstick_tc002.yaml
+-
+ file_name: opnfv_yardstick_tc006.yaml
+-
+ file_name: opnfv_yardstick_tc007.yaml
+-
+ file_name: opnfv_yardstick_tc008.yaml
+-
+ file_name: opnfv_yardstick_tc009.yaml
+-
+ file_name: opnfv_yardstick_tc011.yaml
+-
+ file_name: opnfv_yardstick_tc020.yaml
+-
+ file_name: opnfv_yardstick_tc021.yaml
+-
+ file_name: opnfv_yardstick_tc037.yaml
+-
+ file_name: opnfv_yardstick_tc038.yaml