X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fprepare_env.sh;h=e8f287bcd4766b562c28831070efdbde8a3fe92d;hb=d2cb7ce7331d8da4c3b5b70b09dac49cf65d1710;hp=2c71c7c69bc8c8a92f880208389379504fab1af6;hpb=4afe3795d72295ff181853fc9e6602e98ddf608b;p=yardstick.git

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 2c71c7c69..e8f287bcd 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -15,42 +15,47 @@
 : ${NODE_NAME:='unknown'}
 : ${EXTERNAL_NETWORK:='admin_floating_net'}
 
-
 # Extract network name from EXTERNAL_NETWORK
 #  e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24'
 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
@@ -58,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
-    expect $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+    bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
 fi
 
 # Fetching id_rsa file from jump_server..."
@@ -83,5 +88,33 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
     sshpass -p r00tme scp 2>/dev/null $ssh_options \
     root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
-fi
 
+    sshpass -p r00tme ssh 2>/dev/null $ssh_options \
+        root@${INSTALLER_IP} fuel node>fuel_node
+
+    # update fuel node id and ip info according to the CI env
+    controller_IDs=($(cat fuel_node|grep controller|awk '{print $1}'))
+    compute_IDs=($(cat fuel_node|grep compute|awk '{print $1}'))
+    controller_ips=($(cat fuel_node|grep controller|awk '{print $10}'))
+    compute_ips=($(cat fuel_node|grep compute|awk '{print $10}'))
+
+    pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
+    node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}'))
+
+    if [[ ${controller_ips[0]} ]]; then
+        sed -i "${node_line_num[0]}s/node1/node${controller_IDs[0]}/;s/ip1/${controller_ips[0]}/" $pod_yaml;
+    fi
+    if [[ ${controller_ips[1]} ]]; then
+        sed -i "${node_line_num[1]}s/node2/node${controller_IDs[1]}/;s/ip2/${controller_ips[1]}/" $pod_yaml;
+    fi
+    if [[ ${controller_ips[2]} ]]; then
+        sed -i "${node_line_num[2]}s/node3/node${controller_IDs[2]}/;s/ip3/${controller_ips[2]}/" $pod_yaml;
+    fi
+    if [[ ${compute_ips[0]} ]]; then
+        sed -i "${node_line_num[3]}s/node4/node${compute_IDs[0]}/;s/ip4/${compute_ips[0]}/" $pod_yaml;
+    fi
+    if [[ ${compute_ips[1]} ]]; then
+        sed -i "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
+    fi
+
+fi