On 05/21/2018 07:33 PM, Alistair Francis wrote:
> On Sun, May 20, 2018 at 8:16 PM, Fam Zheng <f...@redhat.com> wrote:
>> On Fri, 05/18 11:34, Alistair Francis wrote:
>>> Avocado is not trivial to setup on non-Fedora systems. To simplfying
>>> future testing add a docker test image that runs Avocado tests.
>>>
>>> Signed-off-by: Alistair Francis <alistair.fran...@wdc.com>
>>> ---
>>> v2:
>>> - Add a seperate fedora-avocado Docker image
>>> - Move the avocado vt-bootstrap into the Docker file
>>>
>>> tests/docker/Makefile.include | 1 +
>>> .../docker/dockerfiles/fedora-avocado.docker | 25 +++++++++++++++++
>>> tests/docker/test-avocado | 28 +++++++++++++++++++
>>> 3 files changed, 54 insertions(+)
>>> create mode 100644 tests/docker/dockerfiles/fedora-avocado.docker
>>> create mode 100755 tests/docker/test-avocado
>>>
>>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>>> index ef1a3e62eb..0e3d108dde 100644
>>> --- a/tests/docker/Makefile.include
>>> +++ b/tests/docker/Makefile.include
>>> @@ -60,6 +60,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
>>> docker-image-debian-s390x-cross: docker-image-debian9
>>> docker-image-debian-win32-cross: docker-image-debian8-mxe
>>> docker-image-debian-win64-cross: docker-image-debian8-mxe
>>> +docker-image-fedora-avocado: docker-image-fedora
>>> docker-image-travis: NOUSER=1
>>>
>>> # Expand all the pre-requistes for each docker image and test combination
>>> diff --git a/tests/docker/dockerfiles/fedora-avocado.docker
>>> b/tests/docker/dockerfiles/fedora-avocado.docker
>>> new file mode 100644
>>> index 0000000000..55b19eebbf
>>> --- /dev/null
>>> +++ b/tests/docker/dockerfiles/fedora-avocado.docker
>>> @@ -0,0 +1,25 @@
>>> +FROM qemu:fedora
>>> +
>>> +ENV PACKAGES \
>>> + libvirt-devel \
>>> + nc \
>>> + python-avocado \
>>> + python2-devel python3-devel \
>>> + qemu-kvm \
>>> + tcpdump \
>>> + xz
>>> +ENV PIP_PACKAGES \
>>> + avocado-qemu \
>>> + avocado-framework-plugin-runner-remote \
>>> + avocado-framework-plugin-runner-vm \
>>> + avocado-framework-plugin-vt
>>> +
>>> +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
>>
>> I think this is inherited from qemu:fedora, no?
>
> It is, I have removed it.
>
>>
>>> +
>>> +RUN dnf install -y $PACKAGES
>>> +RUN pip install $PIP_PACKAGES
>>> +RUN avocado vt-bootstrap --yes-to-all --vt-type qemu
>>> +
>>> +RUN rpm -q $PACKAGES | sort > /packages.txt
>>
>> Can you keep the parent image's list with ">>" or appending to the old
>> $PACKAGES
>> in the above "ENV" directive?
>>
>>> +
>>> +ENV FEATURES mingw clang pyyaml asan avocado
>>
>> Similarly, is it possible to append to the parent list instead of overriding?
>
> I have changed both of these to append to the original variables.
Feel free to add my R-b then:
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
I'll wait your respin to try again, hoping I got my proxy issues solved.
>>
>>> diff --git a/tests/docker/test-avocado b/tests/docker/test-avocado
>>> new file mode 100755
>>> index 0000000000..40474db2ce
>>> --- /dev/null
>>> +++ b/tests/docker/test-avocado
>>> @@ -0,0 +1,28 @@
>>> +#!/bin/bash -e
>>> +#
>>> +# Avocado tests on Fedora, as these are a real pain on Debian systems
>>
>> Shouldn't pip packages work just well on Debian too? What are the pain?
>> (Cc'ing Cleber who may want to know this).
>
> There is no debian package at the moment.
>
> Alistair
>
>>
>> Fam
>>
>>> +#
>>> +# Copyright (c) 2018 Western Digital.
>>> +#
>>> +# Authors:
>>> +# Alistair Francis <alistair.fran...@wdc.com>
>>> +#
>>> +# This work is licensed under the terms of the GNU GPL, version 2
>>> +# or (at your option) any later version. See the COPYING file in
>>> +# the top-level directory.
>>> +#
>>> +# Run this test: NOUSER=1 make docker-test-avocado@fedora-avocado
>>> +
>>> +. common.rc
>>> +
>>> +requires avocado
>>> +
>>> +cd "$BUILD_DIR"
>>> +
>>> +DEF_TARGET_LIST="x86_64-softmmu"
>>> +TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
>>> +build_qemu
>>> +install_qemu
>>> +
>>> +export PATH="${PATH}:$(pwd)"
>>> +avocado run boot --vt-qemu-bin ./x86_64-softmmu/qemu-system-x86_64
>>> --
>>> 2.17.0
>>>
