Cirros 0.3.2 is fixing the host name setting issue, which
is required for turning on the tempest instance validation tests.
Change-Id: I1b87740ab02c4eb0a8df653a35e1f85d40abda51
Related-Bug: #1132686
... | ... |
@@ -56,7 +56,7 @@ BUILD_INTERVAL=1 |
56 | 56 |
BUILD_TIMEOUT=196 |
57 | 57 |
|
58 | 58 |
|
59 |
-BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-0.3.1" |
|
59 |
+BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}" |
|
60 | 60 |
|
61 | 61 |
# Cinder/Volume variables |
62 | 62 |
TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default} |
... | ... |
@@ -310,9 +310,9 @@ function configure_tempest { |
310 | 310 |
iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud" |
311 | 311 |
iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}" |
312 | 312 |
iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH" |
313 |
- iniset $TEMPEST_CONFIG boto ari_manifest cirros-0.3.1-x86_64-initrd.manifest.xml |
|
314 |
- iniset $TEMPEST_CONFIG boto ami_manifest cirros-0.3.1-x86_64-blank.img.manifest.xml |
|
315 |
- iniset $TEMPEST_CONFIG boto aki_manifest cirros-0.3.1-x86_64-vmlinuz.manifest.xml |
|
313 |
+ iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-x86_64-initrd.manifest.xml |
|
314 |
+ iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-x86_64-blank.img.manifest.xml |
|
315 |
+ iniset $TEMPEST_CONFIG boto aki_manifest cirros-${CIRROS_VERSION}-x86_64-vmlinuz.manifest.xml |
|
316 | 316 |
iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type" |
317 | 317 |
iniset $TEMPEST_CONFIG boto http_socket_timeout 30 |
318 | 318 |
iniset $TEMPEST_CONFIG boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros} |
... | ... |
@@ -326,7 +326,10 @@ function configure_tempest { |
326 | 326 |
fi |
327 | 327 |
|
328 | 328 |
# Scenario |
329 |
- iniset $TEMPEST_CONFIG scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec" |
|
329 |
+ iniset $TEMPEST_CONFIG scenario img_dir "$FILES/images/cirros-${CIRROS_VERSION}-x86_64-uec" |
|
330 |
+ iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-x86_64-blank.img" |
|
331 |
+ iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-x86_64-initrd" |
|
332 |
+ iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-x86_64-vmlinuz" |
|
330 | 333 |
|
331 | 334 |
# Large Ops Number |
332 | 335 |
iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0} |
... | ... |
@@ -403,8 +406,8 @@ function install_tempest { |
403 | 403 |
|
404 | 404 |
# init_tempest() - Initialize ec2 images |
405 | 405 |
function init_tempest { |
406 |
- local base_image_name=cirros-0.3.1-x86_64 |
|
407 |
- # /opt/stack/devstack/files/images/cirros-0.3.1-x86_64-uec |
|
406 |
+ local base_image_name=cirros-${CIRROS_VERSION}-x86_64 |
|
407 |
+ # /opt/stack/devstack/files/images/cirros-${CIRROS_VERSION}-x86_64-uec |
|
408 | 408 |
local image_dir="$FILES/images/${base_image_name}-uec" |
409 | 409 |
local kernel="$image_dir/${base_image_name}-vmlinuz" |
410 | 410 |
local ramdisk="$image_dir/${base_image_name}-initrd" |
... | ... |
@@ -306,12 +306,14 @@ esac |
306 | 306 |
# glance as a disk image. If it ends in .gz, it is uncompressed first. |
307 | 307 |
# example: |
308 | 308 |
# http://cloud-images.ubuntu.com/releases/precise/release/ubuntu-12.04-server-cloudimg-armel-disk1.img |
309 |
-# http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz |
|
309 |
+# http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-rootfs.img.gz |
|
310 | 310 |
# * OpenVZ image: |
311 | 311 |
# OpenVZ uses its own format of image, and does not support UEC style images |
312 | 312 |
|
313 | 313 |
#IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image |
314 |
-#IMAGE_URLS="http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" # cirros full disk image |
|
314 |
+#IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img" # cirros full disk image |
|
315 |
+ |
|
316 |
+CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"} |
|
315 | 317 |
|
316 | 318 |
# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of |
317 | 319 |
# which may be set in ``localrc``. Also allow ``DEFAULT_IMAGE_NAME`` and |
... | ... |
@@ -323,11 +325,11 @@ case "$VIRT_DRIVER" in |
323 | 323 |
libvirt) |
324 | 324 |
case "$LIBVIRT_TYPE" in |
325 | 325 |
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc |
326 |
- DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-rootfs} |
|
327 |
- IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz"};; |
|
326 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-rootfs} |
|
327 |
+ IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-rootfs.img.gz"};; |
|
328 | 328 |
*) # otherwise, use the uec style image (with kernel, ramdisk, disk) |
329 |
- DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec} |
|
330 |
- IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};; |
|
329 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec} |
|
330 |
+ IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"};; |
|
331 | 331 |
esac |
332 | 332 |
;; |
333 | 333 |
vsphere) |
... | ... |
@@ -337,8 +339,8 @@ case "$VIRT_DRIVER" in |
337 | 337 |
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-disk} |
338 | 338 |
IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"};; |
339 | 339 |
*) # Default to Cirros with kernel, ramdisk and disk image |
340 |
- DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec} |
|
341 |
- IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};; |
|
340 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec} |
|
341 |
+ IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"};; |
|
342 | 342 |
esac |
343 | 343 |
|
344 | 344 |
HEAT_FETCHED_TEST_IMAGE=${HEAT_FETCHED_TEST_IMAGE:-""} |
... | ... |
@@ -97,7 +97,7 @@ Of course, use real passwords if this machine is exposed. |
97 | 97 |
# Download a vhd and a uec image |
98 | 98 |
IMAGE_URLS="\ |
99 | 99 |
https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz,\ |
100 |
- http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz" |
|
100 |
+ http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz" |
|
101 | 101 |
|
102 | 102 |
# Explicitly set virt driver |
103 | 103 |
VIRT_DRIVER=xenserver |