[PULL,v5,16/44] tests/docker: fix sorting in package lists

Message ID	20210714150036.21060-17-alex.bennee@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL v5 16/44] tests/docker: fix sorting in package lists Date: Wed, 14 Jul 2021 16:00:08 +0100 Message-Id: <20210714150036.21060-17-alex.bennee@linaro.org> In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Cc: Thomas Huth <thuth@redhat.com>, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, qemu-devel@nongnu.org, Willian Rampazzo <willianr@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing, build and plugin updates \| expand [PULL,v5,00/44] testing, build and plugin updates [PULL,v5,01/44] Jobs based on custom runners: documentation and configuration placeholder [PULL,v5,02/44] Jobs based on custom runners: build environment docs and playbook [PULL,v5,03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook [PULL,v5,04/44] Jobs based on custom runners: add job definitions for QEMU's machines [PULL,v5,05/44] tests/tcg: also disable the signals test for plugins [PULL,v5,06/44] meson: fix condition for io_uring stubs [PULL,v5,07/44] disable modular TCG on Darwin [PULL,v5,08/44] build: validate that system capstone works before using it [PULL,v5,09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run [PULL,v5,10/44] cirrus: delete FreeBSD and macOS jobs [PULL,v5,11/44] hw/usb/ccid: remove references to NSS [PULL,v5,12/44] tests/docker: don't use BUILDKIT in GitLab either [PULL,v5,13/44] tests/docker: use project specific container registries [PULL,v5,14/44] tests/docker: use explicit docker.io registry [PULL,v5,15/44] tests/docker: remove FEATURES env var from templates [PULL,v5,16/44] tests/docker: fix sorting in package lists [PULL,v5,17/44] tests/docker: fix mistakes in centos package lists [PULL,v5,18/44] tests/docker: fix mistakes in fedora package list [PULL,v5,19/44] tests/docker: fix mistakes in ubuntu package lists [PULL,v5,20/44] tests/docker: remove mingw packages from Fedora [PULL,v5,21/44] tests/docker: expand centos8 package list [PULL,v5,22/44] tests/docker: expand fedora package list [PULL,v5,23/44] tests/docker: expand ubuntu1804 package list [PULL,v5,24/44] tests/docker: expand ubuntu2004 package list [PULL,v5,25/44] tests/docker: expand opensuse-leap package list [PULL,v5,26/44] tests/vm: update NetBSD to 9.2 [PULL,v5,27/44] tests/vm: update openbsd to release 6.9 [PULL,v5,28/44] tests/tcg: make test-mmap a little less aggressive [PULL,v5,29/44] plugins: fix-up handling of internal hostaddr for 32 bit [PULL,v5,30/44] meson.build: move TCG plugin summary output [PULL,v5,31/44] meson.build: relax the libdl test to one for the function dlopen [PULL,v5,32/44] tcg/plugins: remove some stale entries from the symbol list [PULL,v5,33/44] configure: don't allow plugins to be enabled for a non-TCG build [PULL,v5,34/44] configure: add an explicit static and plugins check [PULL,v5,35/44] configure: stop user enabling plugins on Windows for now [PULL,v5,36/44] tcg/plugins: enable by default for most TCG builds [PULL,v5,37/44] contrib/plugins: enable -Wall for building plugins [PULL,v5,38/44] contrib/plugins: add execlog to log instruction execution and memory access [PULL,v5,39/44] docs/devel: tcg-plugins: add execlog plugin description [PULL,v5,40/44] plugins: Added a new cache modelling plugin [PULL,v5,41/44] plugins/cache: Enable cache parameterization [PULL,v5,42/44] plugins/cache: Added FIFO and LRU eviction policies [PULL,v5,43/44] docs/devel: Added cache plugin to the plugins docs [PULL,v5,44/44] MAINTAINERS: Added myself as a reviewer for TCG Plugins

Message ID

20210714150036.21060-17-alex.bennee@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Subject: [PULL v5 16/44] tests/docker: fix sorting in package lists
Date: Wed, 14 Jul 2021 16:00:08 +0100
Message-Id: <20210714150036.21060-17-alex.bennee@linaro.org>
In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org>
References: <20210714150036.21060-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::42f;
	envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
	DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
	RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
	SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Thomas Huth <thuth@redhat.com>, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?=
	<berrange@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<philmd@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<f4bug@amsat.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>,
	qemu-devel@nongnu.org,  Willian Rampazzo <willianr@redhat.com>,
	=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

testing, build and plugin updates | expand

Commit Message

Alex Bennée July 14, 2021, 3 p.m. UTC

From: Daniel P. Berrangé <berrange@redhat.com>


This will make diffs in later patches clearer.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20210623142245.307776-7-berrange@redhat.com>
Message-Id: <20210709143005.1554-15-alex.bennee@linaro.org>

-- 
2.20.1

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

[PULL,v5,16/44] tests/docker: fix sorting in package lists

Commit Message

Patch