diff options
Diffstat (limited to 'jjb/functest/functest-alpine.sh')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 735ca6f7f..b5db2ed37 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -6,7 +6,10 @@ set +o pipefail check_os_deployment() { FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} + echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." + docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment" + echo "Checking deployment, CMD: ${cmd}" eval ${cmd} ret_value=$? if [ ${ret_value} != 0 ]; then @@ -107,8 +110,12 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi -rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds" +if [[ ${BRANCH} == "stable/euphrates" ]]; then + rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds" +else + rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" +fi # Set iptables rule to allow forwarding return traffic for container if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then |