summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-08 03:12:26 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-08 03:12:26 +0000
commit40505723a4aa94f7502039931a508d04c2a3e008 (patch)
treeb4f715da469080d25dad03d83f7740101863a5c6
parent684d5eb4d14a7ed79757be95d8a276ace38e70d8 (diff)
parent83c1cf6f98a2dc8548a0ff18fe0d87b52a4bc05d (diff)
Merge "Bugfix: Fix a bug that cause yardstick-trusty-server image build fail"
-rwxr-xr-xtests/ci/prepare_env.sh5
1 files changed, 4 insertions, 1 deletions
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
+