From 80888497f7f6f4abb93d0c9dc368cb2009f8fc3e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 27 Aug 2018 20:24:47 +0200 Subject: Support VIO (VMware in OpenStack) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It allows converting all images to vmdk and then patching all testcases. DEPLOY_SCENARIO should match vio to do so. convert_images.sh has to be called as prerequisite. JIRA: FUNCTEST-992 JIRA: FUNCTEST-993 Change-Id: Ie35bf80af1cd9610a8c416ec01b81b61c6148cfe Signed-off-by: Cédric Ollivier (cherry picked from commit d176e20067368d834e8b77d4f685f48cb54d03f5) --- docker/core/Dockerfile | 2 +- functest/ci/config_patch.yaml | 57 +++++++++++++++++++++++++++++++++++++++++++ functest/ci/convert_images.sh | 11 +++++++++ setup.cfg | 1 + tox.ini | 1 + 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 functest/ci/convert_images.sh diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 202963368..270c221d3 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=stable/pike RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ - grep sed wget ca-certificates git openssh-client && \ + grep sed wget ca-certificates git openssh-client qemu-img && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index b21996fce..fd182b33d 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -147,3 +147,60 @@ ovs: flavor_alt_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} extra_alt_properties: {'hw_mem_page_size':'large'} + +vio: + vping_ssh: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + vping_userdata: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + tempest_smoke_serial: + 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_defcore: + 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 + patrole: + 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 + neutron_trunk: + 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 + tempest_full_parallel: + 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 + rally_sanity: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + rally_full: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + cloudify_ims: + image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk + image_format: vmdk + image_alt: + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk + image_alt_format: vmdk + vyos_vrouter: + image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.vmdk + image_format: vmdk + image_alt: /home/opnfv/functest/images/vyos-1.1.7.vmdk + image_alt_format: vmdk + juju_epc: + 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 + image_alt_format: vmdk diff --git a/functest/ci/convert_images.sh b/functest/ci/convert_images.sh new file mode 100644 index 000000000..d7ed3887b --- /dev/null +++ b/functest/ci/convert_images.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -ex + +pushd "${1:-/home/opnfv/functest/images}" + +for i in *.img *.qcow2; do + qemu-img convert -f qcow2 -O vmdk "$i" "${i%.*}.vmdk" +done + +popd diff --git a/setup.cfg b/setup.cfg index ed6b9ddfc..17cdb64b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ home-page = https://wiki.opnfv.org/display/functest [files] packages = functest scripts = + functest/ci/convert_images.sh functest/ci/download_images.sh [entry_points] diff --git a/tox.ini b/tox.ini index 1d84aa902..fce8cff22 100644 --- a/tox.ini +++ b/tox.ini @@ -109,6 +109,7 @@ commands = nosetests {[testenv:py35]dirs} basepython = python2.7 files = functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh + functest/ci/convert_images.sh functest/ci/download_images.sh build.sh commands = bashate {[testenv:bashate]files} -- cgit 1.2.3-korg