diff options
| author |   juraj.linkes <jlinkes@cisco.com> | 2016-09-16 15:59:28 +0200 |
|---|---|---|
| committer | Juraj Linkeš <jlinkes@cisco.com> | 2016-09-21 12:32:29 +0000 |
| commit | 1c9eb305280b43036bb164de491d9bec6737deca (patch) | |
| tree | 7e6b2238c103bd593e770cd2dbe771d8aa375812 /tests/ci | |
| parent | f20f1a81c62d44e17fb8ce9c7fa814fcc2c3aa98 (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>
(cherry picked from commit a85d844d13ef461830bd66cc96e8c7454bd867f6)
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/yardstick-verify | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index c5b42faa5..c26bd9deb 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 qcow2 \ --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" @@ -276,6 +294,11 @@ load_yardstick_image() DISK_FORMAT="qcow2" 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 \ |