From 9e4871c61b3d656df8a28993debeae250e0a6042 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Fri, 2 Feb 2018 02:18:19 +0000 Subject: [PATCH] Keep creds file name unchanged in Euphrates Change-Id: I216d1877cba73272bbb37bf84c74dbf77dc2952d Signed-off-by: Linda Wang --- jjb/functest/functest-alpine.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 0f4e80f24..b5db2ed37 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -110,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/env_file" +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 -- 2.16.6