summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-06-26 17:58:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-26 17:58:27 +0000
commit5f7080c5425306cece86d12baed429d795b92f44 (patch)
tree2bba35c896a715fd0f87d0b3a0dfa83cfecb8eac
parentcfec3d2dc5650099f0d1d6f01f3bf51263c5e8e2 (diff)
parent48e5ae5db6ebd6a43bb4ab6cc6e38e3e186dd001 (diff)
Merge "Take shaker arm64 image into account"
-rw-r--r--functest/ci/config_aarch64_patch.yaml8
-rw-r--r--functest/ci/download_images.sh1
2 files changed, 9 insertions, 0 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 8f3144650..e605ff4e9 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -70,6 +70,14 @@ os:
hw_disk_bus: 'scsi'
hw_scsi_model: 'virtio-scsi'
+ shaker:
+ image: /home/opnfv/functest/images/shaker-image-arm64.qcow2
+ extra_properties:
+ hw_firmware_type: 'uefi'
+ hw_video_model: 'vga'
+ hw_disk_bus: 'scsi'
+ hw_scsi_model: 'virtio-scsi'
+
neutron_trunk:
image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
extra_properties:
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 5057f05fb..a23d8f707 100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -16,6 +16,7 @@ https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloud
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
http://testresults.opnfv.org/functest/shaker-image.qcow2
+http://testresults.opnfv.org/functest/shaker-image-arm64.qcow2
EOF
xz --decompress --force --keep \