summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-10-09 16:13:41 +0300
committerDelia Popescu <delia.popescu@enea.com>2018-10-09 16:21:08 +0300
commit51c9a0f5f061ffb1b62f82117c8a69fc7ed94da1 (patch)
treef9f7900928e0a735f544fe0c2da1f9e97659e2d4
parent1c96a8bbf28f43b83b0bc3880910ec76d59bea84 (diff)
Set image and flavor env variables functest for ovs|fdio
Set IMAGE_PROPERTIES and FLAVOR_EXTRA_SPECS environment variables for functest CI run for ovs and fdio scenarios. Change-Id: Ib2be311ee28d4ae633ec5496a12e741f701cc7ab Signed-off-by: Delia Popescu <delia.popescu@enea.com>
-rwxr-xr-xjjb/functest/functest-alpine.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 2e21fb6b7..0aa687698 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}"