remove releng from Dockerfile and elsewhere

Current CI does openrc fetching before starting
the Docker container and then passes openrc
via Docker mount

JIRA: YARDSTICK-691

Change-Id: Id0649130f48db5a5586149b237c5252b953e57be
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 3 insertions, 25 deletions

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index caef8acce..37b72b369 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -28,34 +28,12 @@ OPENRC=/etc/yardstick/openstack.creds
 INSTALLERS=(apex compass fuel joid)
 
 RC_VAR_EXIST=false
-if [ "${OS_AUTH_URL}" -a "${OS_USERNAME}" -a "${OS_PASSWORD}" -a "${EXTERNAL_NETWORK}" ];then
+if [[ "${OS_AUTH_URL}" && "${OS_USERNAME}" && "${OS_PASSWORD}" && "${EXTERNAL_NETWORK}" ]];then
     RC_VAR_EXIST=true
 fi
 
-if [ "${RC_VAR_EXIST}" = false ]; then
-    if [ ! -f $OPENRC ];then
-        # credentials file is not given, check if environment variables are set
-        # to get the creds using fetch_os_creds.sh later on
-        echo "INFO: Checking environment variables INSTALLER_TYPE and INSTALLER_IP"
-        if [ -z ${INSTALLER_TYPE} ]; then
-            echo "environment variable 'INSTALLER_TYPE' is not defined."
-            exit 1
-        elif [[ ${INSTALLERS[@]} =~ ${INSTALLER_TYPE} ]]; then
-            echo "INSTALLER_TYPE env variable found: ${INSTALLER_TYPE}"
-        else
-            echo "Invalid env variable INSTALLER_TYPE=${INSTALLER_TYPE}"
-            exit 1
-        fi
-
-        if [ "$DEPLOY_TYPE" == "virt" ]; then
-            FETCH_CRED_ARG="-v -d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}"
-        else
-            FETCH_CRED_ARG="-d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}"
-        fi
-
-        $RELENG_REPO_DIR/utils/fetch_os_creds.sh $FETCH_CRED_ARG
-    fi
-    source $OPENRC
+if [[ "${RC_VAR_EXIST}" = false && -f ${OPENRC} ]]; then
+    . ${OPENRC}
 fi
 
 export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME