From 5febab052b0bb46e3ebe3bcedeb28ccc962ec150 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 21 Dec 2017 14:34:48 +0400 Subject: Update cirros image to 0.4.0 ChangeLog: https://git.launchpad.net/cirros/plain/ChangeLog Change-Id: Ic41bec08b9dbfa7f1a501d5ba18602ba455fb5d0 Signed-off-by: Michael Polenchuk --- docs/testing/user/configguide/configguide.rst | 8 ++++---- docs/testing/user/userguide/troubleshooting.rst | 2 +- functest/ci/config_functest.yaml | 14 +++++++------- functest/ci/config_patch.yaml | 4 ++-- functest/ci/download_images.sh | 4 ++-- .../scenario/templates/server_with_ports.yaml.template | 2 +- .../scenario/templates/server_with_volume.yaml.template | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index a98772a6a..d63286475 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -66,8 +66,8 @@ Create a directory for the different images (attached as a Docker volume):: images/CentOS-7-aarch64-GenericCloud.qcow2 images/CentOS-7-aarch64-GenericCloud.qcow2.xz images/CentOS-7-x86_64-GenericCloud.qcow2 - images/cirros-0.3.5-x86_64-disk.img - images/cirros-0.3.5-x86_64-lxc.tar.gz + images/cirros-0.4.0-x86_64-disk.img + images/cirros-0.4.0-x86_64-lxc.tar.gz images/cirros-d161201-aarch64-disk.img images/cirros-d161201-aarch64-initramfs images/cirros-d161201-aarch64-kernel @@ -730,6 +730,6 @@ work with the above pre-requisite actions. .. _`Proxy`: https://docs.docker.com/engine/admin/systemd/#http-proxy .. _`Install Docker on CentOS`: https://docs.docker.com/engine/installation/linux/centos/ .. _`Functest User Guide`: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/user/userguide/index.html -.. _`images/CentOS-7-x86_64-GenericCloud.qcow2` http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -.. _`images/cirros-0.3.5-x86_64-disk.img` https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img +.. _`images/CentOS-7-x86_64-GenericCloud.qcow2` http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img +.. _`images/cirros-0.4.0-x86_64-disk.img` https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img .. _`images/ubuntu-14.04-server-cloudimg-amd64-disk1.img` https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 diff --git a/docs/testing/user/userguide/troubleshooting.rst b/docs/testing/user/userguide/troubleshooting.rst index becc24a3d..1e342b653 100644 --- a/docs/testing/user/userguide/troubleshooting.rst +++ b/docs/testing/user/userguide/troubleshooting.rst @@ -100,7 +100,7 @@ In this case, proceed to create it manually. These are some hints:: --protocol tcp --port-range-min 80 --port-range-max 80 --remote-ip-prefix 0.0.0.0/0 The next step is to create the instances. The image used is located in -*/home/opnfv/functest/data/cirros-0.3.5-x86_64-disk.img* and a Glance image is created +*/home/opnfv/functest/data/cirros-0.4.0-x86_64-disk.img* and a Glance image is created with the name **functest-vping**. If booting the instances fails (i.e. the status is not **ACTIVE**), you can check why it failed by doing:: diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 48322a6cc..a40d80f20 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -23,15 +23,15 @@ general: openstack: creds: /home/opnfv/functest/conf/openstack.creds - image_name: Cirros-0.3.5 - image_name_alt: Cirros-0.3.5-1 - image_file_name: cirros-0.3.5-x86_64-disk.img + image_name: Cirros-0.4.0 + image_name_alt: Cirros-0.4.0-1 + image_file_name: cirros-0.4.0-x86_64-disk.img image_url: - http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img image_user: cirros image_disk_format: qcow2 image_username: cirros - image_password: cubswin:) + image_password: gocubsgo flavor_name: opnfv_flavor flavor_name_alt: opnfv_flavor_1 @@ -53,9 +53,9 @@ snaps: use_floating_ips: 'True' images: glance_tests: - disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img + disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img cirros: - disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img + disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img ubuntu: disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index b6ba9790b..32b67057f 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -2,8 +2,8 @@ lxd: general: openstack: - image_name: Cirros-0.3.5 - image_file_name: cirros-0.3.5-x86_64-lxc.tar.gz + image_name: Cirros-0.4.0 + image_file_name: cirros-0.4.0-x86_64-lxc.tar.gz image_disk_format: raw fdio: diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 09a32848b..14cda1470 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -5,13 +5,13 @@ set -ex wget_opts="-N --tries=1 --connect-timeout=30" cat << EOF | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images} -http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img +http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-lxc.tar.gz +http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-lxc.tar.gz http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template index ed5e61fe0..35b107838 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template +++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template @@ -7,7 +7,7 @@ parameters: default: public image: type: string - default: cirros-0.3.5-x86_64-uec + default: cirros-0.4.0-x86_64-uec flavor: type: string default: m1.tiny diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template index 116b5bb6c..5c9a86b79 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template +++ b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template @@ -4,7 +4,7 @@ parameters: # set all correct defaults for parameters before launch test image: type: string - default: cirros-0.3.5-x86_64-uec + default: cirros-0.4.0-x86_64-uec flavor: type: string default: m1.tiny -- cgit 1.2.3-korg