From: "Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Ed Maste" <emaste@freebsd.org>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Daniel P . Berrangé" <berrange@redhat.com>,
qemu-block@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Li-Wen Hsu" <lwhsu@freebsd.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Yonggang Luo" <luoyonggang@gmail.com>
Subject: [PATCH v2 2/6] tests: Refresh lcitool submodule
Date: Thu, 20 Jan 2022 12:05:41 +0100 [thread overview]
Message-ID: <20220120110545.263404-3-f4bug@amsat.org> (raw)
In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org>
Refresh lcitool submodule and the generated files by running:
$ make lcitool-refresh
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/dockerfiles/alpine.docker | 3 ++-
tests/docker/dockerfiles/centos8.docker | 3 +--
tests/docker/dockerfiles/fedora.docker | 3 +--
tests/docker/dockerfiles/opensuse-leap.docker | 2 +-
tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
tests/lcitool/libvirt-ci | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index eb2251c81c8..9d7f74fc51e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile alpine-edge qemu
+# $ lcitool dockerfile --layers all alpine-edge qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -109,6 +109,7 @@ RUN apk update && \
zlib-dev \
zlib-static \
zstd-dev && \
+ apk list | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index cbb909d02b3..fde6a036263 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile centos-8 qemu
+# $ lcitool dockerfile --layers all centos-8 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -69,7 +69,6 @@ RUN dnf update -y && \
libssh-devel \
libtasn1-devel \
libubsan \
- libudev-devel \
liburing-devel \
libusbx-devel \
libxml2-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 60207f3da38..82f504e40d6 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile fedora-35 qemu
+# $ lcitool dockerfile --layers all fedora-35 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -77,7 +77,6 @@ exec "$@"' > /usr/bin/nosync && \
libssh-devel \
libtasn1-devel \
libubsan \
- libudev-devel \
liburing-devel \
libusbx-devel \
libxml2-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index f57d8cfb299..30e7038148a 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile opensuse-leap-152 qemu
+# $ lcitool dockerfile --layers all opensuse-leap-152 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 0ffa3c4d4b5..4ea272d143b 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile ubuntu-1804 qemu
+# $ lcitool dockerfile --layers all ubuntu-1804 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 4e562dfdcd3..90988b2bc53 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile ubuntu-2004 qemu
+# $ lcitool dockerfile --layers all ubuntu-2004 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 29cec2153b9..226c178a2a1 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd
+Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457
--
2.34.1
next prev parent reply other threads:[~2022-01-20 12:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-20 11:05 ` Philippe Mathieu-Daudé via [this message]
2022-01-20 11:05 ` [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
2022-01-20 11:12 ` Daniel P. Berrangé
2022-01-20 11:05 ` [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
2022-01-20 13:37 ` Thomas Huth
2022-01-20 15:33 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:14 ` Daniel P. Berrangé
2022-01-20 11:18 ` Philippe Mathieu-Daudé via
2022-01-20 11:21 ` Philippe Mathieu-Daudé via
2022-01-20 11:32 ` Daniel P. Berrangé
2022-01-20 11:35 ` Daniel P. Berrangé
2022-01-20 11:15 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
2022-01-20 11:08 ` Philippe Mathieu-Daudé via
2022-01-20 11:15 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220120110545.263404-3-f4bug@amsat.org \
--to=qemu-devel@nongnu.org \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=emaste@freebsd.org \
--cc=f4bug@amsat.org \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=mjt@tls.msk.ru \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).