Browse code

Merge "Set default image for exercises"

Jenkins authored on 2012/06/15 05:55:15
Showing 1 changed files
... ...
@@ -93,8 +93,10 @@ MELANGECLIENT_BRANCH=master
93 93
 #IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image
94 94
 case "$LIBVIRT_TYPE" in
95 95
     lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
96
+        DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-rootfs
96 97
         IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";;
97 98
     *)  # otherwise, use the uec style image (with kernel, ramdisk, disk)
99
+        DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-uec
98 100
         IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";;
99 101
 esac
100 102