summaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2016-09-09 08:56:20 +0800
committerliang gao <jean.gaoliang@huawei.com>2016-09-14 07:40:26 +0000
commitb6d7290c9643d68053b44810cfff25550c7d7350 (patch)
tree2aa8a600045db84851009886f873560980ea8d80 /tests/ci
parent506f3d6b06b553012d26adaf460af81e715036c1 (diff)
Bugfix: Fix a bug that cause yardstick-trusty-server image build fail
JIRA: YARDSTICK-340 Change-Id: If305308acb76178d5a9a4af9a058e467a1f65a70 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit 1bd1558189922c408569c8b07d6825089dd3f4b9)
Diffstat (limited to 'tests/ci')
-rwxr-xr-xtests/ci/prepare_env.sh11
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 82e9103b2..9c949ec4f 100755
--- 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 \;)
@@ -78,6 +77,10 @@ verify_connectivity() {
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
@@ -89,11 +92,6 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
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
@@ -120,4 +118,3 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
fi
fi
-