diff options
Diffstat (limited to 'tests/ci/load_images.sh')
| -rwxr-xr-x | tests/ci/load_images.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 49b972777..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" @@ -90,14 +102,14 @@ load_yardstick_image() if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then output=$(eval glance --os-image-api-version 1 image-create \ - --name yardstick-trusty-server \ + --name yardstick-image \ --is-public true --disk-format root-tar \ --container-format bare \ $EXTRA_PARAMS \ --file $RAW_IMAGE) else output=$(eval glance --os-image-api-version 1 image-create \ - --name yardstick-trusty-server \ + --name yardstick-image \ --is-public true --disk-format qcow2 \ --container-format bare \ $EXTRA_PARAMS \ @@ -203,8 +215,8 @@ create_nova_flavor() main() { - QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img" - RAW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.tar.gz" + QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img" + RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz" build_yardstick_image load_yardstick_image |