diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-02 10:17:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-02 10:17:22 +0000 |
| commit | 81cc894782fe04905c36466840fce83d63935306 (patch) | |
| tree | bfff2ff94601c8ea0c3d9b4ad0ece7576fd5d233 /jjb | |
| parent | 839d5e0ddcde12bc46f9cf6dde6c8eeca1cfdb90 (diff) | |
| parent | 9e4871c61b3d656df8a28993debeae250e0a6042 (diff) | |
Merge "Keep creds file name unchanged in Euphrates"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 |
1 files changed, 5 insertions, 1 deletions
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 |