From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 10 Oct 2018 23:47:09 +0000 (+0000)
Subject: Merge "Set image and flavor env variables functest for ovs|fdio"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9f2107eb7569697a77f74cec6894637318e0fac7;hp=-c;p=releng.git

Merge "Set image and flavor env variables functest for ovs|fdio"
---

9f2107eb7569697a77f74cec6894637318e0fac7
diff --combined jjb/functest/functest-alpine.sh
index 701d4b471,0aa687698..a34f8a435
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -136,7 -136,7 +136,7 @@@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; t
      COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
          "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
      IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi"
 -    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e ${IMAGE_PROPERTIES}"
 +    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\""
  fi
  
  
@@@ -150,6 -150,15 +150,15 @@@ if [[ ${INSTALLER_TYPE} == 'compass' &
      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}"