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

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index bbd7b5553..be59b7f37 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -15,7 +15,6 @@
 : ${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 \;)
@@ -84,37 +83,32 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     sshpass -p r00tme scp 2>/dev/null $ssh_options \
     root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
 
-    ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
-    YARD_IMG_ARCH=amd64
-    sshpass -p r00tme ssh $ssh_options -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
-    export YARD_IMG_ARCH
-
-    if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
-        sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers
-    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 "s/ip1/${controller_ips[0]}/" $pod_yaml;
+        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 "s/ip2/${controller_ips[1]}/" $pod_yaml;
+        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 "s/ip3/${controller_ips[2]}/" $pod_yaml;
+        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 "s/ip4/${compute_ips[0]}/" $pod_yaml;
+        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 "s/ip5/${compute_ips[1]}/" $pod_yaml;
+        sed -i "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
     fi
 
 fi