Add sshkey and user config into functest container 37/53837/7
authorLinda Wang <wangwulin@huawei.com>
Thu, 15 Mar 2018 07:48:06 +0000 (07:48 +0000)
committerLinda Wang <wangwulin@huawei.com>
Fri, 16 Mar 2018 06:50:23 +0000 (06:50 +0000)
This is to support sfc test on Compass:
https://gerrit.opnfv.org/gerrit/#/c/52825/

Change-Id: I77223363205dc8edd34de8a6c529e68d3b6a6442
Signed-off-by: Linda Wang <wangwulin@huawei.com>
jjb/functest/functest-alpine.sh

index 432bbbb..a2f1828 100755 (executable)
@@ -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