From bb36098cf866ea5a5a653ca7d7caded3f9b7972f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 18 May 2019 20:38:24 +0200 Subject: Update all patches about functest configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It takes into account the last updates about snaps, cloudify and refstack. Change-Id: I959f8ed1c98cd1879b51b62252aeb38918af6a2c Signed-off-by: Cédric Ollivier (cherry picked from commit dbb00ca3ee3e3349b42c8133dee6b1abdbcb10c3) --- functest/ci/config_aarch64_patch.yaml | 6 ------ functest/ci/config_patch.yaml | 15 ++++++--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 1e5aed410..3d4acae13 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 diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index 754f19edf..406b38dde 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: @@ -47,9 +44,6 @@ fdio: flavor_ram: 1024 ovs: - general: - openstack: - flavor_ram: 1024 vmready1: flavor_ram: 1024 vmready2: @@ -179,10 +173,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 +188,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 -- cgit 1.2.3-korg