From 43d6672e637a5b5b68ac4c382140996b4b9b17da Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 26 Jun 2018 08:23:25 +0200 Subject: Inherit rally from VmReady1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also fixes clean(). Change-Id: I42d1305d5cdb5a717cfa7fce26798ac7102310f7 Signed-off-by: Cédric Ollivier --- functest/ci/config_aarch64_patch.yaml | 16 +++++++++++++ functest/ci/config_functest.yaml | 8 ------- functest/ci/config_patch.yaml | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 8 deletions(-) (limited to 'functest/ci') diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 990c7d6be..b288641e1 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -126,6 +126,22 @@ os: 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' + snaps: images: glance_tests: diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 67ecc3424..5aa02be68 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -151,14 +151,6 @@ tempest: rally: deployment_name: opnfv-rally network_name: rally-net - # network_type: vlan - # physical_network: physnet2 - # segmentation_id: 2366 - subnet_name: rally-subnet - subnet_cidr: 192.168.140.0/24 - router_name: rally-router - flavor_name: rally-tiny - flavor_alt_name: rally-mini vnf: juju_epc: diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index 563dbe35d..c2c6cb417 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -17,45 +17,67 @@ fdio: vmready1: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vmready2: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 singlevm1: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 singlevm2: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vping_ssh: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vping_userdata: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 cinder_test: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 tempest_smoke_serial: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 refstack_defcore: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 patrole: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 shaker: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 neutron_trunk: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 barbican: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 tempest_full_parallel: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 + rally_sanity: + flavor_extra_specs: {'hw:mem_page_size':'large'} + extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 + rally_full: + flavor_extra_specs: {'hw:mem_page_size':'large'} + extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 ovs: general: @@ -68,42 +90,64 @@ ovs: vmready1: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vmready2: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 singlevm1: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 singlevm2: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vping_ssh: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 vping_userdata: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 cinder_test: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 tempest_smoke_serial: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 refstack_defcore: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 patrole: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 shaker: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 neutron_trunk: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 barbican: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 tempest_full_parallel: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 + rally_sanity: + flavor_extra_specs: {'hw:mem_page_size':'large'} + extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 + rally_full: + flavor_extra_specs: {'hw:mem_page_size':'large'} + extra_properties: {'hw_mem_page_size':'large'} + flavor_ram: 1024 -- cgit 1.2.3-korg