X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fprepare_env.sh;h=3d9cc298f9738d33d7ae0b8bb2a1b438306b598a;hb=f456d48971142f0c105142388b2465ee94d91a66;hp=be59b7f376aacacd7b953555b6d8707e3070b89d;hpb=dd4bf5acef87d7c58c0aae3950ef5da386533f5a;p=yardstick.git

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index be59b7f37..3d9cc298f 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -21,35 +21,41 @@ export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;)
 
 # Create openstack credentials
 echo "INFO: Creating openstack credentials .."
-OPENRC=/home/opnfv/openrc
+mkdir -p /etc/yardstick
+OPENRC=/etc/yardstick/openstack.creds
 INSTALLERS=(apex compass fuel joid)
 
-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
+RC_VAR_EXIST=false
+if [ "${OS_AUTH_URL}" -a "${OS_USERNAME}" -a "${OS_PASSWORD}" -a "${EXTERNAL_NETWORK}" ];then
+    RC_VAR_EXIST=true
+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
+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
 
-    $RELENG_REPO_DIR/utils/fetch_os_creds.sh $FETCH_CRED_ARG
+        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
 fi
 
-source $OPENRC
-
 export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME
 
 # Prepare a admin-rc file for StorPerf integration
@@ -57,7 +63,7 @@ $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh
 
 # copy a admin-rc file for StorPerf integration to the deployment location
 if [ "$NODE_NAME" == "huawei-pod1" ]; then
-    bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+    bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh
 fi
 
 # Fetching id_rsa file from jump_server..."