Bugfix: Fix a bug that cause yardstick-trusty-server image build fail

[yardstick.git] / tests / ci / prepare_env.sh

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index cb83d9c..82e9103 100755 (executable)
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -57,7 +57,9 @@ export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME
 $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh
 
 # copy a admin-rc file for StorPerf integration to the deployment location
-expect $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+if [ "$NODE_NAME" == "huawei-pod1" ]; then
+    bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+fi
 
 # Fetching id_rsa file from jump_server..."
 verify_connectivity() {
@@ -73,6 +75,9 @@ verify_connectivity() {
     error "Can not talk to $ip."
 }
 
+YARD_IMG_ARCH=amd64
+export YARD_IMG_ARCH
+
 ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 if [ "$INSTALLER_TYPE" == "fuel" ]; then
@@ -81,5 +86,38 @@ 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
+
+    ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
+    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
+
+    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"
+
+    if [[ ${controller_ips[0]} ]]; then
+        sed -i "s/ip1/${controller_ips[0]}/" $pod_yaml;
+    fi
+    if [[ ${controller_ips[1]} ]]; then
+        sed -i "s/ip2/${controller_ips[1]}/" $pod_yaml;
+    fi
+    if [[ ${controller_ips[2]} ]]; then
+        sed -i "s/ip3/${controller_ips[2]}/" $pod_yaml;
+    fi
+    if [[ ${compute_ips[0]} ]]; then
+        sed -i "s/ip4/${compute_ips[0]}/" $pod_yaml;
+    fi
+    if [[ ${compute_ips[1]} ]]; then
+        sed -i "s/ip5/${compute_ips[1]}/" $pod_yaml;
+    fi
+
 fi