diff options
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 111 | ||||
| -rw-r--r-- | functest/ci/convert_images.sh | 11 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | tox.ini | 1 |
5 files changed, 125 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index bc526dc41..9a5348cc8 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -6,7 +6,7 @@ ARG PIP_TAG=18.0 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 1c3ab4c03..3acb35553 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -272,3 +272,114 @@ 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: + vmready1: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + vmready2: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + singlevm1: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + singlevm2: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + 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 + cinder_test: + image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk + image_format: vmdk + tempest_smoke: + 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-tempest-plugin-api: + 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 + vmtp: + image: + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk + image_format: vmdk + shaker: + image: /home/opnfv/functest/images/shaker-image.vmdk + image_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 + networking-bgpvpn: + 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 + networking-sfc: + 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 + barbican: + 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: + 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_scenario: + 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: + image: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.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 + heat_ims: + image: + /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_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 @@ -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] @@ -111,6 +111,7 @@ files = functest/opnfv_tests/openstack/cinder/write_data.sh functest/opnfv_tests/openstack/cinder/read_data.sh 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} |