[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 23/30] tests/docker: add packages needed for check-accepta
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v3 23/30] tests/docker: add packages needed for check-acceptance |
Date: |
Mon, 29 Jun 2020 12:11:33 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
Hi Alex,
On 6/26/20 8:13 PM, Alex Bennée wrote:
> We need additional python packages to run check-acceptance. Add them
> to the docker images we will be using later.
I'm not sure everybody is interested by that. Maybe we could add an
extra 'acceptance-testing' Docker layer on top and use these images
when running acceptance tests.
Anyway this works so:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/dockerfiles/fedora.docker | 7 +++++++
> tests/docker/dockerfiles/ubuntu2004.docker | 10 +++++++++-
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/tests/docker/dockerfiles/fedora.docker
> b/tests/docker/dockerfiles/fedora.docker
> index 798ddd2c3e0..70b6186bd3e 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -80,7 +80,12 @@ ENV PACKAGES \
> pixman-devel \
> python3 \
> python3-PyYAML \
> + python3-numpy \
> + python3-opencv \
> + python3-pillow \
> + python3-pip \
> python3-sphinx \
> + python3-virtualenv \
> rdma-core-devel \
> SDL2-devel \
> snappy-devel \
> @@ -89,6 +94,8 @@ ENV PACKAGES \
> systemd-devel \
> systemtap-sdt-devel \
> tar \
> + tesseract \
> + tesseract-langpack-eng \
> texinfo \
> usbredir-devel \
> virglrenderer-devel \
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
> b/tests/docker/dockerfiles/ubuntu2004.docker
> index 6050ce7e8a8..f7aac840bf8 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -46,9 +46,17 @@ ENV PACKAGES flex bison \
> libxen-dev \
> libzstd-dev \
> make \
> - python3-yaml \
> + python3-numpy \
> + python3-opencv \
> + python3-pil \
> + python3-pip \
> python3-sphinx \
> + python3-venv \
> + python3-yaml \
> + rpm2cpio \
> sparse \
> + tesseract-ocr \
> + tesseract-ocr-eng \
> texinfo \
> xfslibs-dev\
> vim
>
- Re: [PATCH v3 26/30] gitlab: enable check-tcg for linux-user tests, (continued)
- [PATCH v3 15/30] tests/docker: change tag naming scheme of our images, Alex Bennée, 2020/06/26
- [PATCH v3 19/30] gitlab: build all container images during CI, Alex Bennée, 2020/06/26
- [PATCH v3 23/30] tests/docker: add packages needed for check-acceptance, Alex Bennée, 2020/06/26
- [PATCH v3 28/30] gitlab: split build-disabled into two phases, Alex Bennée, 2020/06/26
- [PATCH v3 29/30] gitlab: limit re-builds of the containers, Alex Bennée, 2020/06/26