X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily.sh;h=91b3e8e0f1444c85ce83136c4069afbfd1752080;hb=824a278e82c9bc5217d6f7c3d99511eb23334f70;hp=58d590c27a9437f39dbbc74e4cc230a6b15310e2;hpb=22ab9accbd34c8e5167b4a92510bee82c0cde630;p=releng.git diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 58d590c27..91b3e8e0f 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -30,15 +30,12 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If dev lab, credentials may not be the default ones, just provide a path to put them into docker # replace the default one by the customized one provided by jenkins config fi -elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then +elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then + if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" else - cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert" - echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh + cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi -elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then - cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa" fi