summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-10-05 10:41:02 +0300
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-06 08:32:31 +0200
commitcbb0697fb931122b4a9eefe90f758ad8e69309c1 (patch)
tree095743d63d10e98ce6c69c11a8344b02877f3ffa
parent54f42524a0507f819df7cab9b1c4832c967c1411 (diff)
Add image extra properties for fuel installer in functest test
With using scsi volume device type, additional image extra_properties are needed. Set environment variable IMAGE_PROPERTIES when installer is fuel for functest test run. Related to: https://gerrit.opnfv.org/gerrit/#/c/61913/ https://gerrit.opnfv.org/gerrit/#/c/63225/ Change-Id: If35aa282abaf5dab1a5bacc2f26fe89292b09605 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
-rwxr-xr-xjjb/functest/functest-alpine.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index c82147489..2e21fb6b7 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -135,7 +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}'")
- envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
+ IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi"
+ envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e ${IMAGE_PROPERTIES}"
fi