The exercises search for an 'ami' image to run; when multiple images are
loaded this fails. Rather than try to guess or just use the first one
we set the default image name to the cirros image that we load by default.
Change-Id: Iae91a011ca9c42a7715747a68e0deba0dba20835
| ... | ... |
@@ -89,8 +89,10 @@ MELANGECLIENT_BRANCH=master |
| 89 | 89 |
#IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image |
| 90 | 90 |
case "$LIBVIRT_TYPE" in |
| 91 | 91 |
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc |
| 92 |
+ DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-rootfs |
|
| 92 | 93 |
IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; |
| 93 | 94 |
*) # otherwise, use the uec style image (with kernel, ramdisk, disk) |
| 95 |
+ DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-uec |
|
| 94 | 96 |
IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; |
| 95 | 97 |
esac |
| 96 | 98 |
|