From: liang gao <jean.gaoliang@huawei.com>
Date: Thu, 1 Sep 2016 09:21:46 +0000 (+0000)
Subject: Merge "ARM64: Add support for aarch64 architecture"
X-Git-Tag: danube.1.0~280
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aed848064e0b4046ff05c2e438884e6ae7a029f1;hp=-c;p=yardstick.git

Merge "ARM64: Add support for aarch64 architecture"
---

aed848064e0b4046ff05c2e438884e6ae7a029f1
diff --combined tests/ci/prepare_env.sh
index 5529a6f73,668d82c1c..bbd7b5553
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@@ -84,13 -84,22 +84,22 @@@ if [ "$INSTALLER_TYPE" == "fuel" ]; the
      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
  
      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"
 +    pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
  
      if [[ ${controller_ips[0]} ]]; then
          sed -i "s/ip1/${controller_ips[0]}/" $pod_yaml;