diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-18 20:38:24 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-06-08 16:38:44 +0200 |
| commit | dbb00ca3ee3e3349b42c8133dee6b1abdbcb10c3 (patch) | |
| tree | a70e41ef4cbff05e495985dffe10db8f0785c2bb | |
| parent | 3472870b0e42c135d004e0006ad3e3607036e553 (diff) | |
Update all patches about functest configs
It takes into account the last updates about snaps, cloudify and
refstack.
Change-Id: I959f8ed1c98cd1879b51b62252aeb38918af6a2c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 16 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 39 |
2 files changed, 36 insertions, 19 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 1e5aed410..2775fc8b9 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -1,11 +1,5 @@ --- os: - general: - openstack: - image_file_name: cirros-0.4.0-aarch64-disk.img - image_url: - /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img - vmready1: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img @@ -35,7 +29,15 @@ os: 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 - refstack_defcore: + refstack_compute: + 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 + + refstack_object: + 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 + + refstack_platform: 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 diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index 754f19edf..159be475e 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -1,8 +1,5 @@ --- fdio: - general: - openstack: - flavor_ram: 1024 vmready1: flavor_ram: 1024 vmready2: @@ -21,7 +18,11 @@ fdio: flavor_ram: 1024 neutron-tempest-plugin-api: flavor_ram: 1024 - refstack_defcore: + refstack_compute: + flavor_ram: 1024 + refstack_object: + flavor_ram: 1024 + refstack_platform: flavor_ram: 1024 patrole: flavor_ram: 1024 @@ -47,9 +48,6 @@ fdio: flavor_ram: 1024 ovs: - general: - openstack: - flavor_ram: 1024 vmready1: flavor_ram: 1024 vmready2: @@ -68,7 +66,11 @@ ovs: flavor_ram: 1024 neutron-tempest-plugin-api: flavor_ram: 1024 - refstack_defcore: + refstack_compute: + flavor_ram: 1024 + refstack_object: + flavor_ram: 1024 + refstack_platform: flavor_ram: 1024 patrole: flavor_ram: 1024 @@ -125,7 +127,17 @@ vio: image_format: vmdk image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk image_alt_format: vmdk - refstack_defcore: + refstack_compute: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_alt_format: vmdk + refstack_object: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_alt_format: vmdk + refstack_platform: image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk image_format: vmdk image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk @@ -179,10 +191,12 @@ vio: image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk image_format: vmdk cloudify: - image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk + image: + /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk image_format: vmdk cloudify_ims: - image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk + image: + /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk image_format: vmdk image_alt: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk @@ -192,7 +206,8 @@ vio: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk image_format: vmdk vyos_vrouter: - image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk + image: + /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk image_format: vmdk image_alt: /home/opnfv/functest/images/vyos-1.1.7.vmdk image_alt_format: vmdk |