diff options
author | Delia Popescu <delia.popescu@enea.com> | 2018-09-06 18:37:11 +0300 |
---|---|---|
committer | Delia Popescu <delia.popescu@enea.com> | 2018-10-05 12:06:59 +0000 |
commit | d7c5419ed8d3dcdb59f4f5f254de0c7bb7a0aec6 (patch) | |
tree | 0f08b9ad3ef2d6f288356696c313aa7922bc2619 /functest/ci | |
parent | 95bd62a751501caf0755e79e33de7a42f72deb27 (diff) |
Use environment variable for image properties
Use IMG_PROP environment variable to read extra image
properties.
Set image_extra_properties for scsi volume types
without file patch, but using IMG_PROP env variable
IMG_PROP is defined through releng.
Image extra_properties will continue to get updates from
functest config file
With this change, remove unnecessary parameters from arm patch
Related to:https://gerrit.opnfv.org/gerrit/#/c/63203/
JIRA:ARMBAND-402
Change-Id: I64139240751b1e109bbe24ba32f487ccd98b9a92
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'functest/ci')
-rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index a4b0cd497..835a82737 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -2,222 +2,98 @@ os: general: openstack: - image_name: TestVM image_file_name: cirros-0.4.0-aarch64-disk.img - image_password: gocubsgo image_url: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - short_id: 'ubuntu16.04' - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' vmready1: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - 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_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' singlevm1: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - 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_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_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_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_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' tempest_smoke: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' neutron-tempest-plugin-api: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' refstack_defcore: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' patrole: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' vmtp: image: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' shaker: image: /home/opnfv/functest/images/shaker-image-arm64.qcow2 - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' neutron_trunk: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' networking-bgpvpn: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' networking-sfc: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' barbican: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' tempest_full: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' tempest_scenario: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - hw_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' - extra_alt_properties: - 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_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_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' snaps: images: glance_tests: disk_file: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - extra_properties: - short_id: 'ubuntu16.04' - 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: - short_id: 'ubuntu16.04' - 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_disk_bus: 'scsi' - hw_scsi_model: 'virtio-scsi' centos: disk_file: /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2 - vping: - image_name: TestVM - tempest: use_custom_flavors: 'True' - - odl_sfc: - image_base_url: "http://artifacts.opnfv.org/sfc/demo" - image_name: sfc_nsh_danube - image_file_name: sf_nsh_danube_arm64.img - image_initrd: sf_nsh_danube_arm64-initrd - image_kernel: sf_nsh_danube_arm64-kernel - image_format: ami - os_cmd_line: 'root=LABEL=cloudimg-rootfs ro' - doctor: - image_name: TestVM |