From 46be00823a6057411aa7eeb105035de58e51fb7c Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Wed, 1 Nov 2017 15:17:40 -0400 Subject: [PATCH] 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 19897716736f8dc6a3c386be594fe7b46142e27a) --- packstack/plugins/provision_700.py | 8 ++++---- run_tests.sh | 16 +++++++--------- tests/scenario001.sh | 6 +++--- tests/scenario002.sh | 6 +++--- tests/scenario003.sh | 6 +++--- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index 321d92b5f..c8f175548 100644 --- a/packstack/plugins/provision_700.py +++ b/packstack/plugins/provision_700.py @@ -32,22 +32,22 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue') DEMO_IMAGE_NAME = 'cirros' DEMO_IMAGE_URL = ( - 'http://trunk.rdoproject.org/cirros-0.3.4-%s-disk.img' + 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' % (arch.cirros_arch()) ) DEMO_IMAGE_SSH_USER = 'cirros' DEMO_IMAGE_FORMAT = 'qcow2' UEC_IMAGE_NAME = 'cirros-uec' UEC_IMAGE_KERNEL_URL = ( - 'http://trunk.rdoproject.org/cirros-0.3.4-%s-kernel' + 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-kernel' % (arch.cirros_arch()) ) UEC_IMAGE_RAMDISK_URL = ( - 'http://trunk.rdoproject.org/cirros-0.3.4-%s-initramfs' + 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-initramfs' % (arch.cirros_arch()) ) UEC_IMAGE_DISK_URL = ( - 'http://trunk.rdoproject.org/cirros-0.3.4-%s-disk.img' + 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' % (arch.cirros_arch()) ) diff --git a/run_tests.sh b/run_tests.sh index 9d59143bb..17ec3031b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -175,20 +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..." - # FIXME(ykarel) download.cirros-cloud.net domain is expired, see - # https://bugs.launchpad.net/cirros/+bug/1713358 - wget --tries=10 http://trunk.rdoproject.org/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://trunk.rdoproject.org/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 \{\} \; diff --git a/tests/scenario001.sh b/tests/scenario001.sh index d63166a09..4c165b3e8 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -30,9 +30,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --os-neutron-l2-agent=ovn \ --os-neutron-ml2-type-drivers="geneve,flat" \ --os-neutron-ml2-tenant-network-types="geneve" \ - --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 \ diff --git a/tests/scenario002.sh b/tests/scenario002.sh index 2b54a4169..209c4f2f4 100755 --- a/tests/scenario002.sh +++ b/tests/scenario002.sh @@ -31,9 +31,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 \ diff --git a/tests/scenario003.sh b/tests/scenario003.sh index 627eb70fa..1754751e1 100755 --- a/tests/scenario003.sh +++ b/tests/scenario003.sh @@ -29,9 +29,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --os-heat-install=y \ --os-magnum-install=y \ --os-panko-install=y \ - --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 \