From: Tim Rozet <trozet@redhat.com>
Date: Tue, 16 Oct 2018 16:08:00 +0000 (+0000)
Subject: Merge "Correctly set IMAGE_PROPERTIES in functest-alpine.sh"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=6c01646f6856db853cac1fd05866ad5d9dda0651

Merge "Correctly set IMAGE_PROPERTIES in functest-alpine.sh"
---

6c01646f6856db853cac1fd05866ad5d9dda0651
diff --cc jjb/functest/functest-alpine.sh
index 17800f25e,dce8a6701..da167358a
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -135,14 -135,10 +135,14 @@@ ssh_options="-o UserKnownHostsFile=/dev
  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
 +    libvirt_vol="-v ${ssh_key}:${FUNCTEST_DIR}/conf/libvirt_key"
 +    envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key"
 +fi
  
  if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
      ssh_key="/tmp/id_rsa"