From 94ddff710a8d4a794477becfcca86fd84b34bc54 Mon Sep 17 00:00:00 2001 From: Delia Popescu Date: Wed, 1 Aug 2018 16:52:33 +0300 Subject: Remove hw_video_model and hw_firmware_type from metadata Starting with the Openstack Queens release, hw_firmware_type=uefi is implied on AArch64 by default Using virtio-video, now default in nova, should be used instead of VGA JIRA: ARMBAND-388 Change-Id: I393093c5a1a9dd9c8259b3987db22650313cf249 Signed-off-by: Delia Popescu --- functest/ci/config_aarch64_patch.yaml | 45 ----------------------------------- 1 file changed, 45 deletions(-) (limited to 'functest/ci/config_aarch64_patch.yaml') diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 00020af6a..b73132480 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -8,8 +8,6 @@ os: image_url: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' short_id: 'ubuntu16.04' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' @@ -17,80 +15,60 @@ os: vmready1: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' vmready2: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' singlevm1: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' singlevm2: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' vping_ssh: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' vping_userdata: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' cinder_test: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' functest_smoke_serial: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' refstack_defcore: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' patrole: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' @@ -98,56 +76,42 @@ os: image: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' 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: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' barbican: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' tempest_full_parallel: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' rally_sanity: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' rally_full: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' @@ -157,34 +121,25 @@ os: disk_file: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' short_id: 'ubuntu16.04' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' cirros: disk_file: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img extra_properties: - hw_firmware_type: 'uefi' short_id: 'ubuntu16.04' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' ubuntu: disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' centos: disk_file: /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2 - extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' vping: image_name: TestVM -- cgit 1.2.3-korg