diff options
| author |   Delia Popescu <delia.popescu@enea.com> | 2018-10-17 10:39:32 +0300 |
|---|---|---|
| committer | Delia Popescu <delia.popescu@enea.com> | 2018-10-17 17:54:55 +0300 |
| commit | 87facd5a83c7018776100839647ec8f24a324df3 (patch) | |
| tree | 422d6af63fc5c82d420e57829dc3afb4efed563c | |
| parent | 3f9fb3f3ad1bb8b56eaec535f11a523d3bfac4a2 (diff) | |
Fix duplicate IMAGE_PROPERTIES env variable in functest run
Update envs only once with IMAGE_PROPERTIES and FLAVOR_EXTRA_SPECS
if installer type is fuel or deploy scenario is ovs or fdio
Change-Id: I7c1e997cf95d30972688e697574458a3a0f1e55c
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index da167358a..e8d81ea0c 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -136,7 +136,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then 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=${IMAGE_PROPERTIES}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then @@ -156,12 +156,15 @@ fi if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then - IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" else - IMAGE_PROPERTIES="hw_mem_page_size: large" + 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}\"" + FLAVOR_EXTRA_SPECS="hw:mem_page_size:large" +fi + +if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then + envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" |