Update Cirros image to 0.3.5
It turns out that Cirros 0.3.5 has been out for a while, we should
use the updated image. The changelog for cirros is not published
but it's available here [1].
This is also what devstack has been using [2].
[1]: http://paste.openstack.org/raw/625252/
[2]: https://git.openstack.org/cgit/openstack-dev/devstack/tree/stackrc?id=2c9343e5db44fa7a41ca6924737331dd9088ef8f#n671
Change-Id: Iea145f69ee461192e6d4d2d7d9427c3acb954c27
(cherry picked from commit 1989771673)
This commit is contained in:
David Moreau-Simard
Alfredo Moralejo
parent
9ac0b6a356
commit
0aede73854
|
|
@ -30,19 +30,19 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')
|
|||
|
||||
DEMO_IMAGE_NAME = 'cirros'
|
||||
DEMO_IMAGE_URL = (
|
||||
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
|
||||
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img'
|
||||
)
|
||||
DEMO_IMAGE_SSH_USER = 'cirros'
|
||||
DEMO_IMAGE_FORMAT = 'qcow2'
|
||||
UEC_IMAGE_NAME = 'cirros-uec'
|
||||
UEC_IMAGE_KERNEL_URL = (
|
||||
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel'
|
||||
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-kernel'
|
||||
)
|
||||
UEC_IMAGE_RAMDISK_URL = (
|
||||
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs'
|
||||
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-initramfs'
|
||||
)
|
||||
UEC_IMAGE_DISK_URL = (
|
||||
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
|
||||
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img'
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
14
run_tests.sh
14
run_tests.sh
|
|
@ -175,18 +175,18 @@ which pip || $SUDO easy_install pip
|
|||
rm -rf /tmp/cirros
|
||||
mkdir /tmp/cirros
|
||||
|
||||
if [ -f ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz ]; then
|
||||
tar -xzvf ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
|
||||
if [ -f ~/cache/files/cirros-0.3.5-x86_64-uec.tar.gz ]; then
|
||||
tar -xzvf ~/cache/files/cirros-0.3.5-x86_64-uec.tar.gz -C /tmp/cirros/
|
||||
else
|
||||
echo "No pre-cached uec archive found, downloading..."
|
||||
wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz -P /tmp/cirros/
|
||||
tar -xzvf /tmp/cirros/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
|
||||
wget --tries=10 http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz -P /tmp/cirros/
|
||||
tar -xzvf /tmp/cirros/cirros-0.3.5-x86_64-uec.tar.gz -C /tmp/cirros/
|
||||
fi
|
||||
if [ -f ~/cache/files/cirros-0.3.4-x86_64-disk.img ]; then
|
||||
cp -p ~/cache/files/cirros-0.3.4-x86_64-disk.img /tmp/cirros/
|
||||
if [ -f ~/cache/files/cirros-0.3.5-x86_64-disk.img ]; then
|
||||
cp -p ~/cache/files/cirros-0.3.5-x86_64-disk.img /tmp/cirros/
|
||||
else
|
||||
echo "No pre-cached disk image found, downloading..."
|
||||
wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/cirros/
|
||||
wget --tries=10 http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P /tmp/cirros/
|
||||
fi
|
||||
echo "Using pre-cached images:"
|
||||
find /tmp/cirros -type f -printf "%m %n %u %g %s %t" -exec md5sum \{\} \;
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--nagios-install=y \
|
||||
--amqp-enable-ssl=y \
|
||||
--glance-backend=file \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
--provision-demo=y \
|
||||
--provision-tempest=y \
|
||||
--run-tempest=y \
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--os-sahara-install=y \
|
||||
--os-trove-install=y \
|
||||
--keystone-token-format=UUID \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
--provision-demo=y \
|
||||
--provision-tempest=y \
|
||||
--run-tempest=y \
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||
--os-magnum-install=y \
|
||||
--os-panko-install=y \
|
||||
--ceilometer-events-backend=panko \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
|
||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
|
||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
|
||||
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
|
||||
--provision-demo=y \
|
||||
--provision-tempest=y \
|
||||
--run-tempest=y \
|
||||
|
|
|
|||
Loading…
Reference in New Issue