diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-16 16:08:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-16 16:08:00 +0000 |
| commit | 6c01646f6856db853cac1fd05866ad5d9dda0651 (patch) | |
| tree | 34eaf1fc1dfff26779894b659be98f861baf9662 | |
| parent | fa61619e64d56bee97df49bc0a80fa6bc7c5da79 (diff) | |
| parent | 2a37527a2ef500f19ec9c5548e61d8d3b88eb6e2 (diff) | |
Merge "Correctly set IMAGE_PROPERTIES in functest-alpine.sh"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 17800f25e..da167358a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -135,8 +135,8 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" 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}\"" + IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES}" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then |