diff options
author | Rex Lee <limingjiang@huawei.com> | 2016-11-30 04:53:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-11-30 04:53:09 +0000 |
commit | dd4bf5acef87d7c58c0aae3950ef5da386533f5a (patch) | |
tree | e1f023f545706ea9cbd08d71da3d47c4976f5240 /tests/ci/load_images.sh | |
parent | 136684a74580fe3e891c4cbc17aab5074614b3c0 (diff) | |
parent | 1c04ac5041a248b79bbeab5a44a4b303ca16fe7d (diff) |
Merge "Decoupling prepare_env.sh and load_images.sh"
Diffstat (limited to 'tests/ci/load_images.sh')
-rwxr-xr-x | tests/ci/load_images.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 54a145fd3..405d72076 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -12,6 +12,18 @@ set -e +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 + +ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch" +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 + UCA_HOST="cloud-images.ubuntu.com" if [ $YARD_IMG_ARCH = "arm64" ]; then export VIVID_IMG_URL="http://${UCA_HOST}/vivid/current/vivid-server-cloudimg-arm64.tar.gz" |