diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-09-20 06:57:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-20 06:57:40 +0000 |
| commit | 0869d92ee124bbefdfb60e3a8f02510d031f9a44 (patch) | |
| tree | 6255c9637b75584ec16dbdd5c109abb2efd1f2dc /tests/ci/yardstick-verify | |
| parent | ec87a089682ed7f08619167c16d08bdc0b1ae97e (diff) | |
| parent | a85d844d13ef461830bd66cc96e8c7454bd867f6 (diff) | |
Merge "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"
Diffstat (limited to 'tests/ci/yardstick-verify')
| -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 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 \ |