* [PATCH 0/2] tests: Refresh lcitool submodule
@ 2022-01-10 12:46 Philippe Mathieu-Daudé
2022-01-10 12:46 ` [PATCH 1/2] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-10 12:46 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Daniel P . Berrangé, Beraldo Leal,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
Alex Bennée
Refresh lcitool to latest.
Based on Alex's testing/next
Based-on: <20220105135009.1584676-1-alex.bennee@linaro.org>
Philippe Mathieu-Daudé (2):
MAINTAINERS: Cover lcitool submodule with build test / automation
tests: Refresh lcitool submodule
MAINTAINERS | 1 +
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 +-
8 files changed, 9 insertions(+), 9 deletions(-)
--
2.33.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] MAINTAINERS: Cover lcitool submodule with build test / automation
2022-01-10 12:46 [PATCH 0/2] tests: Refresh lcitool submodule Philippe Mathieu-Daudé
@ 2022-01-10 12:46 ` 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:19 ` [PATCH 0/2] " Philippe Mathieu-Daudé via
2 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-10 12:46 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Daniel P . Berrangé, Beraldo Leal,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
Alex Bennée
lcitool is used by build test / automation, we want maintainers
to get notified if the submodule is updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index f871d759fdf..aff87d272ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3491,6 +3491,7 @@ F: .travis.yml
F: scripts/ci/
F: tests/docker/
F: tests/vm/
+F: tests/lcitool/
F: scripts/archive-source.sh
W: https://gitlab.com/qemu-project/qemu/pipelines
W: https://travis-ci.org/qemu/qemu
--
2.33.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] tests: Refresh lcitool submodule
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-10 12:46 ` Philippe Mathieu-Daudé
2022-01-19 17:33 ` Daniel P. Berrangé
2022-01-19 17:19 ` [PATCH 0/2] " Philippe Mathieu-Daudé via
2 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-10 12:46 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Daniel P . Berrangé, Beraldo Leal,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
Alex Bennée
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
--
2.33.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] tests: Refresh lcitool submodule
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-10 12:46 ` [PATCH 2/2] tests: Refresh lcitool submodule Philippe Mathieu-Daudé
@ 2022-01-19 17:19 ` Philippe Mathieu-Daudé via
2 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-19 17:19 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P . Berrangé, Thomas Huth, Alex Bennée,
Beraldo Leal, Wainer dos Santos Moschetta
ping?
(the testing/next queue this patch was depending on is now merged).
On 1/10/22 13:46, Philippe Mathieu-Daudé wrote:
> Refresh lcitool to latest.
>
> Based on Alex's testing/next
> Based-on: <20220105135009.1584676-1-alex.bennee@linaro.org>
>
> Philippe Mathieu-Daudé (2):
> MAINTAINERS: Cover lcitool submodule with build test / automation
> tests: Refresh lcitool submodule
>
> MAINTAINERS | 1 +
> 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 +-
> 8 files changed, 9 insertions(+), 9 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] MAINTAINERS: Cover lcitool submodule with build test / automation
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é
0 siblings, 0 replies; 7+ messages in thread
From: Daniel P. Berrangé @ 2022-01-19 17:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Thomas Huth, Alex Bennée, qemu-devel,
Wainer dos Santos Moschetta, Beraldo Leal
On Mon, Jan 10, 2022 at 01:46:37PM +0100, Philippe Mathieu-Daudé wrote:
> lcitool is used by build test / automation, we want maintainers
> to get notified if the submodule is updated.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> MAINTAINERS | 1 +
> 1 file changed, 1 insertion(+)
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 :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] tests: Refresh lcitool submodule
2022-01-10 12:46 ` [PATCH 2/2] tests: Refresh lcitool submodule Philippe Mathieu-Daudé
@ 2022-01-19 17:33 ` Daniel P. Berrangé
2022-01-19 17:37 ` Philippe Mathieu-Daudé via
0 siblings, 1 reply; 7+ messages in thread
From: Daniel P. Berrangé @ 2022-01-19 17:33 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Thomas Huth, Alex Bennée, qemu-devel,
Wainer dos Santos Moschetta, Beraldo Leal
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 :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] tests: Refresh lcitool submodule
2022-01-19 17:33 ` Daniel P. Berrangé
@ 2022-01-19 17:37 ` Philippe Mathieu-Daudé via
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-19 17:37 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Thomas Huth, Alex Bennée, Beraldo Leal,
Wainer dos Santos Moschetta
On 1/19/22 18:33, Daniel P. Berrangé wrote:
> 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/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.
This in done in the "Add support for macOS 12 build on Cirrus-CI"
patch:
https://lore.kernel.org/qemu-devel/20220110131001.614319-8-f4bug@amsat.org/
> regardless
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-19 17:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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é
2022-01-19 17:37 ` Philippe Mathieu-Daudé via
2022-01-19 17:19 ` [PATCH 0/2] " Philippe Mathieu-Daudé via
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).