summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2018-10-18 14:56:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-18 14:56:06 +0000
commit84c13a04a8682b4c413ff587a963f4fdd67cc550 (patch)
treeebec43b2b5ad16d3c4f3fec59f535ab551aaba4d
parent04e66d80c9d2c6348f672bc6c90ea5bef9b0ffe4 (diff)
parent87facd5a83c7018776100839647ec8f24a324df3 (diff)
Merge "Fix duplicate IMAGE_PROPERTIES env variable in functest run"
-rwxr-xr-xjjb/functest/functest-alpine.sh13
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}"