From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: Re: [PATCH 2/2] tests: Refresh lcitool submodule
Date: Wed, 19 Jan 2022 17:33:53 +0000 [thread overview]
Message-ID: <YehLgVvAW5SFIZli@redhat.com> (raw)
In-Reply-To: <20220110124638.610145-3-f4bug@amsat.org>
On Mon, Jan 10, 2022 at 01:46:38PM +0100, Philippe Mathieu-Daudé wrote:
> Refresh lcitool submodule and the generated files by running:
>
> $ make lcitool-refresh
>
> 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..8f48e54238d 160000
> --- a/tests/lcitool/libvirt-ci
> +++ b/tests/lcitool/libvirt-ci
> @@ -1 +1 @@
> -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd
> +Subproject commit 8f48e54238d28d7a427a541d6dbe56432e3c4660
If you update that further you'll get the commit you added to
support macos-12.
regardless
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2022-01-19 17:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 12:46 [PATCH 0/2] tests: Refresh lcitool submodule Philippe Mathieu-Daudé
2022-01-10 12:46 ` [PATCH 1/2] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé
2022-01-19 17:29 ` Daniel P. Berrangé
2022-01-10 12:46 ` [PATCH 2/2] tests: Refresh lcitool submodule Philippe Mathieu-Daudé
2022-01-19 17:33 ` Daniel P. Berrangé [this message]
2022-01-19 17:37 ` Philippe Mathieu-Daudé via
2022-01-19 17:19 ` [PATCH 0/2] " Philippe Mathieu-Daudé via
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=YehLgVvAW5SFIZli@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@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).