diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-10 23:47:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-10 23:47:09 +0000 |
| commit | 9f2107eb7569697a77f74cec6894637318e0fac7 (patch) | |
| tree | 718e073b4bb4182334da42281e7c8a116be44096 /jjb | |
| parent | dc9acb20964cae37e5fd197984233c5614d4990d (diff) | |
| parent | 51c9a0f5f061ffb1b62f82117c8a69fc7ed94da1 (diff) | |
Merge "Set image and flavor env variables functest for ovs|fdio"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 701d4b471..a34f8a435 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -150,6 +150,15 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" fi +if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then + if [[ -n ${IMAGE_PROPERTIES} ]]; then + IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + else + IMAGE_PROPERTIES="hw_mem_page_size: large" + fi + FLAVOR_EXTRA_SPECS="hw:mem_page_size: large" + envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" +fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" |