diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-16 16:06:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-16 16:06:45 +0000 |
| commit | fa61619e64d56bee97df49bc0a80fa6bc7c5da79 (patch) | |
| tree | 187c9f3255b0d8ae96b490d7bfef5bb0321b3535 | |
| parent | a4efde04f2797f31ee861891a89a7ec2973567df (diff) | |
| parent | a5058e0157f7ded34faba01bd97c8dbc33e7ba14 (diff) | |
Merge "Provide libvirt credentials"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index a34f8a435..17800f25e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -139,6 +139,10 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then 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" @@ -160,7 +164,7 @@ if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} |