diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-22 07:58:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-22 07:58:48 +0000 |
| commit | 78e2b978507589a5254b9dcdcf03f6a0df8a8143 (patch) | |
| tree | 8d24c99e1cb3670778f7a14b6bcb11ebf900695c /tests/ci | |
| parent | a594ab3f2985d9482930f2bc9bb0145106eca75f (diff) | |
| parent | 13d68ab65475ec556383480a17dbaf63e3ab140c (diff) | |
Merge "aarch64: Improve arch detection snippet"
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/load_images.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index ee46962b5..4b8f2c0e1 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -15,21 +15,22 @@ set -e YARD_IMG_ARCH=amd64 export YARD_IMG_ARCH -HW_FW_TYPE="" -if [ "${YARD_IMG_ARCH}" == "arm64" ]; then - HW_FW_TYPE=uefi -fi -export HW_FW_TYPE - if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" | sudo tee -a /etc/sudoers fi -ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch" +# Look for a compute node, that is online, and check if it is aarch64 +ARCH_SCRIPT="ssh \$(fuel2 node list | awk -F'|' '\$6 ~ /compute/ && \$11 ~ /rue/ {print \$7; exit;}') uname -m 2>/dev/null | grep -q aarch64" if [ "$INSTALLER_TYPE" == "fuel" ]; then sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root "${INSTALLER_IP}" "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64 fi +HW_FW_TYPE="" +if [ "${YARD_IMG_ARCH}" == "arm64" ]; then + HW_FW_TYPE=uefi +fi +export HW_FW_TYPE + UCA_HOST="cloud-images.ubuntu.com" if [ "${YARD_IMG_ARCH}" == "arm64" ]; then export CLOUD_IMG_URL="http://${UCA_HOST}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" |