From: JingLu5 <lvjing5@huawei.com>
Date: Wed, 7 Sep 2016 06:45:09 +0000 (+0800)
Subject: Bugfix: Fix a bug that cause yardstick-trusty-server image build fail
X-Git-Tag: danube.1.0~274^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=83c1cf6f98a2dc8548a0ff18fe0d87b52a4bc05d;p=yardstick.git

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

JIRA: YARDSTICK-340

Change-Id: I0e754df3a6f0869241ae2bdd5d0090182ebcce6b
Signed-off-by: JingLu5 <lvjing5@huawei.com>
---

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index bbd7b5553..82e9103b2 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -75,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
@@ -85,7 +88,6 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     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
 
@@ -118,3 +120,4 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     fi
 
 fi
+