[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/22] tests/docker: fix sorting in package lists
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v4 06/22] tests/docker: fix sorting in package lists |
Date: |
Wed, 23 Jun 2021 15:22:29 +0100 |
This will make diffs in later patches clearer.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/centos8.docker | 2 +-
tests/docker/dockerfiles/fedora.docker | 4 ++--
tests/docker/dockerfiles/opensuse-leap.docker | 16 ++++++++--------
tests/docker/dockerfiles/ubuntu1804.docker | 4 ++--
tests/docker/dockerfiles/ubuntu2004.docker | 8 +++++---
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index 8f810810f3..ee52305646 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -22,9 +22,9 @@ ENV PACKAGES \
lzo-devel \
make \
mesa-libEGL-devel \
- nmap-ncat \
nettle-devel \
ninja-build \
+ nmap-ncat \
perl-Test-Harness \
pixman-devel \
python36 \
diff --git a/tests/docker/dockerfiles/fedora.docker
b/tests/docker/dockerfiles/fedora.docker
index 64a413f5e0..4a0a84eb43 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:33
# Please keep this list sorted alphabetically
ENV PACKAGES \
+ SDL2-devel \
bc \
brlapi-devel \
bzip2 \
@@ -79,10 +80,10 @@ ENV PACKAGES \
mingw64-pixman \
mingw64-pkg-config \
mingw64-SDL2 \
- nmap-ncat \
ncurses-devel \
nettle-devel \
ninja-build \
+ nmap-ncat \
numactl-devel \
perl \
perl-Test-Harness \
@@ -97,7 +98,6 @@ ENV PACKAGES \
python3-sphinx_rtd_theme \
python3-virtualenv \
rdma-core-devel \
- SDL2-devel \
snappy-devel \
sparse \
spice-server-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index 7ebff1b3a8..6011447181 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -9,46 +9,46 @@ ENV PACKAGES \
cyrus-sasl-devel \
gcc \
gcc-c++ \
- mkisofs \
gettext-runtime \
git \
glib2-devel \
glusterfs-devel \
- libgnutls-devel \
gtk3-devel \
+ libSDL2-devel \
+ libSDL2_image-devel \
libaio-devel \
libattr-devel \
libcap-ng-devel \
libepoxy-devel \
libfdt-devel \
+ libgnutls-devel \
libiscsi-devel \
libjpeg8-devel \
+ libnuma-devel \
+ libpixman-1-0-devel \
libpmem-devel \
libpng16-devel \
librbd-devel \
libseccomp-devel \
+ libspice-server-devel \
libssh-devel \
lzo-devel \
make \
- libSDL2_image-devel \
+ mkisofs \
ncurses-devel \
ninja \
- libnuma-devel \
perl \
- libpixman-1-0-devel \
python3-base \
python3-virtualenv \
rdma-core-devel \
- libSDL2-devel \
snappy-devel \
- libspice-server-devel \
systemd-devel \
systemtap-sdt-devel \
tar \
usbredir-devel \
virglrenderer-devel \
- xen-devel \
vte-devel \
+ xen-devel \
zlib-devel
ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker
b/tests/docker/dockerfiles/ubuntu1804.docker
index 0acdb0d9ad..a50a35e6fe 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -46,10 +46,10 @@ ENV PACKAGES \
libxen-dev \
libzstd-dev \
make \
- python3-yaml \
+ ninja-build \
python3-sphinx \
python3-sphinx-rtd-theme \
- ninja-build \
+ python3-yaml \
sparse \
xfslibs-dev
RUN apt-get update && \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index 88b3cfa136..eee2ef3cac 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,8 +1,10 @@
FROM docker.io/library/ubuntu:20.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
+ bison \
bsdmainutils \
ccache \
clang-10\
+ flex \
gcc \
gcovr \
genisoimage \
@@ -65,8 +67,8 @@ ENV PACKAGES flex bison \
sparse \
tesseract-ocr \
tesseract-ocr-eng \
- xfslibs-dev\
- vim
+ vim \
+ xfslibs-dev
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
RUN dpkg -l $PACKAGES | sort > /packages.txt
--
2.31.1
- [PATCH v4 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 01/22] hw/usb/ccid: remove references to NSS, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 02/22] tests/docker: don't use BUILDKIT in GitLab either, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 03/22] tests/docker: use project specific container registries, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 04/22] tests/docker: use explicit docker.io registry, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 05/22] tests/docker: remove FEATURES env var from templates, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 06/22] tests/docker: fix sorting in package lists,
Daniel P . Berrangé <=
- [PATCH v4 07/22] tests/docker: fix mistakes in centos package lists, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 08/22] tests/docker: fix mistakes in fedora package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 09/22] tests/docker: fix mistakes in ubuntu package lists, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 10/22] tests/docker: remove mingw packages from Fedora, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 11/22] tests/docker: expand centos8 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 12/22] tests/docker: expand fedora package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 13/22] tests/docker: expand ubuntu1804 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 14/22] tests/docker: expand ubuntu2004 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 15/22] tests/docker: expand opensuse-leap package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 16/22] tests/docker: add script for automating container refresh, Daniel P . Berrangé, 2021/06/23