Merge "Add sshkey and user config into functest container"

diff --combined jjb/functest/functest-alpine.sh
index 788a4cd,a2f1828..bdd79c4
--- 1/jjb/functest/functest-alpine.sh
--- 2/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -161,23 -161,40 +161,35 @@@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; t
      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
  
 -
 -if [[ ${DEPLOY_SCENARIO} =~ ^os-.* ]]; then
 -    [[ ${BRANCH##*/} == "master" ]] && check_os_deployment
 -    if [ ${FUNCTEST_MODE} == 'testcase' ]; then
 -        echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
 -        run_test ${FUNCTEST_SUITE_NAME}
 -    elif [ ${FUNCTEST_MODE} == 'tier' ]; then
 -        echo "FUNCTEST_MODE=tier, FUNCTEST_TIER=${FUNCTEST_TIER}"
 -        tiers=(${FUNCTEST_TIER})
 -        run_tiers ${tiers}
 +[[ ${BRANCH##*/} == "master" ]] && check_os_deployment
 +if [ ${FUNCTEST_MODE} == 'testcase' ]; then
 +    echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
 +    run_test ${FUNCTEST_SUITE_NAME}
 +elif [ ${FUNCTEST_MODE} == 'tier' ]; then
 +    echo "FUNCTEST_MODE=tier, FUNCTEST_TIER=${FUNCTEST_TIER}"
 +    tiers=(${FUNCTEST_TIER})
 +    run_tiers ${tiers}
 +else
 +    if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
 +        tiers=(healthcheck smoke features vnf parser)
      else
 -        if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
 -            tiers=(healthcheck smoke features vnf parser)
 -        else
 -            tiers=(healthcheck smoke features)
 -        fi
 -        run_tiers ${tiers}
 +        tiers=(healthcheck smoke features)
      fi
 -else
 -    echo "k8 deployment has not been supported by functest yet"
 +    run_tiers ${tiers}
  fi