summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-05-14 12:03:34 +0300
committerCédric Ollivier <cedric.ollivier@orange.com>2018-05-14 16:10:33 +0200
commitb32a26c6e48727e68c879c118fdae046520e380e (patch)
tree8343317e4824219cbe2073b69e1c8cbd39671dac
parent9467ac24efe793abcf00404ed158f6ab0b73e18e (diff)
Update cirros image version for ARM architecture
Change-Id: Ia7a65a4f83798cb80ca7470d475c2c2d8c9fb6ea Signed-off-by: Delia Popescu <delia.popescu@enea.com> (cherry picked from commit c967e4702b215b3899c822c60529651335220cfa)
-rw-r--r--functest/ci/config_aarch64_patch.yaml6
-rw-r--r--functest/ci/download_images.sh4
-rw-r--r--functest/ci/rally_aarch64_patch.conf2
3 files changed, 5 insertions, 7 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 2f1289c1c..b8caf7da6 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -3,7 +3,7 @@ os:
general:
openstack:
image_name: TestVM
- image_file_name: cirros-d161201-aarch64-disk.img
+ image_file_name: cirros-0.4.0-aarch64-disk.img
image_password: gocubsgo
extra_properties:
hw_firmware_type: 'uefi'
@@ -15,7 +15,7 @@ os:
images:
glance_tests:
disk_file:
- /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img
+ /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
extra_properties:
hw_firmware_type: 'uefi'
short_id: 'ubuntu16.04'
@@ -24,7 +24,7 @@ os:
hw_scsi_model: 'virtio-scsi'
cirros:
disk_file:
- /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img
+ /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
extra_properties:
hw_firmware_type: 'uefi'
short_id: 'ubuntu16.04'
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index c498b9bcc..d3dcee266 100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -11,9 +11,7 @@ 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://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
+http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img
http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz
https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img
diff --git a/functest/ci/rally_aarch64_patch.conf b/functest/ci/rally_aarch64_patch.conf
index e5cae8137..baeceac76 100644
--- a/functest/ci/rally_aarch64_patch.conf
+++ b/functest/ci/rally_aarch64_patch.conf
@@ -1,5 +1,5 @@
img_name_regex = ^TestVM$
-img_url = http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img
+img_url = http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
flavor_ref_ram = 256
flavor_ref_alt_ram = 256
heat_instance_type_ram = 256