Propose common directory for Docker related files

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

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 8c0a8ba..9c949ec 100755 (executable)
--- 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 \;)
@@ -75,6 +74,13 @@ verify_connectivity() {
     error "Can not talk to $ip."
 }
 
+YARD_IMG_ARCH=amd64
+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
+
 ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 if [ "$INSTALLER_TYPE" == "fuel" ]; then
@@ -84,13 +90,16 @@ 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"
+    sshpass -p r00tme ssh $ssh_options -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
+
     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;