diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-30 08:06:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-30 08:06:29 +0000 |
| commit | 2dd6004f6eace58e97c4aa87b8a80b5f099d9f73 (patch) | |
| tree | 217339d22c78e371ddb0e2a09f90b6c27928b581 | |
| parent | c305d24c1499a5aef51c05e94fc9737878548c75 (diff) | |
| parent | e70a83330eaa287fb364aad63829a38b993ad9e7 (diff) | |
Merge "Adapt getting the image architecture to mcp"
| -rwxr-xr-x | tests/ci/load_images.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index c2ae4fe7b..89ebb2dde 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -13,17 +13,20 @@ set -e YARD_IMG_ARCH=amd64 -export YARD_IMG_ARCH 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 # 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 +if [ "${INSTALLER_TYPE}" == 'fuel' ]; then + COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ + "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") + if [ "${COMPUTE_ARCH}" == 'aarch64' ]; then + YARD_IMG_ARCH=arm64 + fi fi +export YARD_IMG_ARCH HW_FW_TYPE="" if [ "${YARD_IMG_ARCH}" == "arm64" ]; then |