diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index 50c0aef8b..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://download.cirros-cloud.net/0.3.4/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://download.cirros-cloud.net/0.3.4/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://download.cirros-cloud.net/0.3.4/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://download.cirros-cloud.net/0.3.4/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 c94e7b315..a161c24af 100755 --- a/run_tests.sh +++ b/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 \{\} \; 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 fcdd0b2bb..4f3cb3294 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 \