From 9673cee2810d47d40c97c05ce5fd7e0e21fa22b0 Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Fri, 8 Jan 2016 17:48:44 +0100 Subject: [PATCH] fix path for joid using LAB_CONFIG Change-Id: Ie96370c488fb8bc2c33d3ce422e93bb3487a84fc Signed-off-by: Morgan Richomme --- jjb/functest/functest-ci-jobs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 249f9f0d6..6f202d8e9 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -191,12 +191,9 @@ 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 $HOME/joid_config/admin-openrc:/home/opnfv/functest/conf/openstack.creds" + labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/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 - if [ -n "${LAB_CONFIG}" ]; then - labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds" - fi fi echo "Functest: Start Docker and prepare environment" envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}" -- 2.16.6