[PULL,v2,08/12] tests/docker: Keep package list sorted

Message ID	20200327181320.23329-9-alex.bennee@linaro.org
State	Accepted
Commit	cdb1a84cfe57558a34d73d0252ad0271539194e0
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 v2 08/12] tests/docker: Keep package list sorted Date: Fri, 27 Mar 2020 18:13:16 +0000 Message-Id: <20200327181320.23329-9-alex.bennee@linaro.org> In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing updates (+ one mttcg change) \| expand [PULL,v2,for,5.0,00/12] testing updates (+ one mttcg change) [PULL,v2,01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h [PULL,v2,02/12] tests/vm: write raw console log [PULL,v2,03/12] tests/vm: move vga setup [PULL,v2,04/12] tests/vm: update FreeBSD to 12.1 [PULL,v2,05/12] tests/vm: update NetBSD to 9.0 [PULL,v2,06/12] tests/vm: fix basevm config [PULL,v2,07/12] configure: disable MTTCG for MIPS guests [PULL,v2,08/12] tests/docker: Keep package list sorted [PULL,v2,09/12] tests/docker: Install gcrypt devel package in Debian image [PULL,v2,10/12] tests/docker: Use Python3 PyYAML in the Fedora image [PULL,v2,11/12] tests/docker: Add libepoxy and libudev packages to the Fedora image [PULL,v2,12/12] .travis.yml: Add a KVM-only s390x job

Message ID

20200327181320.23329-9-alex.bennee@linaro.org

State

Accepted

Commit

cdb1a84cfe57558a34d73d0252ad0271539194e0

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 v2 08/12] tests/docker: Keep package list sorted
Date: Fri, 27 Mar 2020 18:13:16 +0000
Message-Id: <20200327181320.23329-9-alex.bennee@linaro.org>
In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org>
References: <20200327181320.23329-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, Richard Henderson
	<richard.henderson@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<philmd@redhat.com>,  qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

testing updates (+ one mttcg change) | expand

Commit Message

Alex Bennée March 27, 2020, 6:13 p.m. UTC

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


Keep package list sorted, this eases rebase/cherry-pick.

Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

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

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20200322120104.21267-2-philmd@redhat.com>
Message-Id: <20200323161514.23952-8-alex.bennee@linaro.org>

-- 
2.20.1

diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index cdd72de7ebf..9a2a2e515d7 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -2,6 +2,8 @@  FROM centos:7
 RUN yum install -y epel-release centos-release-xen-48
 
 RUN yum -y update
+
+# Please keep this list sorted alphabetically
 ENV PACKAGES \
     bison \
     bzip2 \
@@ -19,6 +21,7 @@  ENV PACKAGES \
     libepoxy-devel \
     libfdt-devel \
     librdmacm-devel \
+    libzstd-devel \
     lzo-devel \
     make \
     mesa-libEGL-devel \
@@ -33,7 +36,6 @@  ENV PACKAGES \
     tar \
     vte-devel \
     xen-devel \
-    zlib-devel \
-    libzstd-devel
+    zlib-devel
 RUN yum install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index a6522228c02..019eb12dcb1 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,4 +1,6 @@ 
 FROM fedora:30
+
+# Please keep this list sorted alphabetically
 ENV PACKAGES \
     bc \
     bison \
@@ -38,6 +40,7 @@  ENV PACKAGES \
     libubsan \
     libusbx-devel \
     libxml2-devel \
+    libzstd-devel \
     llvm \
     lzo-devel \
     make \
@@ -92,8 +95,7 @@  ENV PACKAGES \
     vte291-devel \
     which \
     xen-devel \
-    zlib-devel \
-    libzstd-devel
+    zlib-devel
 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
 
 RUN dnf install -y $PACKAGES

[PULL,v2,08/12] tests/docker: Keep package list sorted

Commit Message

Patch