From: chenjiankun Date: Sat, 1 Apr 2017 09:09:16 +0000 (+0000) Subject: change openrc file path to /etc/yardstick/openstack.creds X-Git-Tag: danube.1.0~11 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=eb09f71f1f8b730bdd3bc8c06cfceb3e2d3eab2c change openrc file path to /etc/yardstick/openstack.creds JIRA: YARDSTICK-623 Now almost yardstick openrc file is in /etc/yardstick/openstack.creds. But only in prepare_env.sh it is /home/opnfv/openrc. So I unified it and change it to /etc/yardstick/openstack.creds in the follow patch: https://gerrit.opnfv.org/gerrit/#/c/32005/ Also there is some adapt work to do in releng. Change-Id: I7764582dec1d9a8f74e53b23e23d98021a20589b Signed-off-by: chenjiankun --- diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index f769e9cdd..973f83ad5 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -18,7 +18,7 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If production lab then creds may be retrieved dynamically # creds are on the jumphost, always in the same folder - labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/openrc" + labconfig="-v $LAB_CONFIG/admin-openrc:/etc/yardstick/openstack.creds" # 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