From 6df4117270358cd2f420e2fd01e2f3f77b486092 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Thu, 15 Mar 2018 07:48:06 +0000 Subject: [PATCH] Add sshkey and user config into functest container This is to support sfc test on Compass: https://gerrit.opnfv.org/gerrit/#/c/52825/ Change-Id: I77223363205dc8edd34de8a6c529e68d3b6a6442 Signed-off-by: Linda Wang --- jjb/functest/functest-alpine.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 432bbbb8b..a2f182815 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -161,7 +161,19 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file_vol}" + +if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'odl.*sfc' ]]; then + ssh_key="/tmp/id_rsa" + user_config="/tmp/openstack_user_config.yml" + docker cp compass-tasks:/root/.ssh/id_rsa $ssh_key + docker cp compass-tasks:/etc/openstack_deploy/openstack_user_config.yml $user_config + sshkey_vol="-v ${ssh_key}:/root/.ssh/id_rsa" + userconfig_vol="-v ${user_config}:${user_config}" + envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" +fi + + +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" set +e -- 2.16.6