| Message ID | 20200626181357.26211-24-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next (gitlab, vm, docker) | expand |
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 >
On 26/06/2020 20.13, Alex Bennée wrote: > We need additional python packages to run check-acceptance. Add them > to the docker images we will be using later. > > 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(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
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
We need additional python packages to run check-acceptance. Add them to the docker images we will be using later. 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(-) -- 2.20.1