| Message ID | 20220121103623.288054-5-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: Refresh lcitool submodule & remove libxml2 | expand |
On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: > 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> > --- > .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- > .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- > 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 +- > 9 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars > index 9c52266811f..bdcce578edf 100644 > --- a/.gitlab-ci.d/cirrus/freebsd-12.vars > +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars > @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' > NINJA='/usr/local/bin/ninja' > PACKAGING_COMMAND='pkg' > PIP3='/usr/local/bin/pip-3.8' > -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' Aren't the FreeBSD jobs currently failing due to lttng-ust not being available anymore? ... I'd somehow expected that this update might fix this, too, but I still see lttng-ust in the list here? Thomas
On Fri, Jan 21, 2022 at 12:40:48PM +0100, Thomas Huth wrote: > On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: > > 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> > > --- > > .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- > > .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- > > 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 +- > > 9 files changed, 10 insertions(+), 11 deletions(-) > > > > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars > > index 9c52266811f..bdcce578edf 100644 > > --- a/.gitlab-ci.d/cirrus/freebsd-12.vars > > +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars > > @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' > > NINJA='/usr/local/bin/ninja' > > PACKAGING_COMMAND='pkg' > > PIP3='/usr/local/bin/pip-3.8' > > -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > > Aren't the FreeBSD jobs currently failing due to lttng-ust not being > available anymore? ... I'd somehow expected that this update might fix this, > too, but I still see lttng-ust in the list here? I had prepped an update to drop it, but @bsdimp indicated that it ought to be a transient problem so I never applied it, hoping it would fix itself. https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/211 It has been broken for ~2 weeks now though, and lttng-ust is not an especially critical feature so we should probably just go ahead and disable it regardless. Regards, Daniel
On Fri, Jan 21, 2022 at 4:47 AM Daniel P. Berrangé <berrange@redhat.com> wrote: > On Fri, Jan 21, 2022 at 12:40:48PM +0100, Thomas Huth wrote: > > On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: > > > 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> > > > --- > > > .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- > > > .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- > > > 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 +- > > > 9 files changed, 10 insertions(+), 11 deletions(-) > > > > > > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars > b/.gitlab-ci.d/cirrus/freebsd-12.vars > > > index 9c52266811f..bdcce578edf 100644 > > > --- a/.gitlab-ci.d/cirrus/freebsd-12.vars > > > +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars > > > @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' > > > NINJA='/usr/local/bin/ninja' > > > PACKAGING_COMMAND='pkg' > > > PIP3='/usr/local/bin/pip-3.8' > > > -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache > cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git > glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs > libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses > nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy > py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv > py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract > texinfo usbredir virglrenderer vte3 zstd' > > > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache > cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 > gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt > libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust > lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf > png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme > py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy > spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > > > > Aren't the FreeBSD jobs currently failing due to lttng-ust not being > > available anymore? ... I'd somehow expected that this update might fix > this, > > too, but I still see lttng-ust in the list here? > > I had prepped an update to drop it, but @bsdimp indicated that it ought > to be a transient problem so I never applied it, hoping it would fix > itself. > > https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/211 > > It has been broken for ~2 weeks now though, and lttng-ust is not an > especially critical feature so we should probably just go ahead and > disable it regardless. > I agree. I got some back and forth from the FreeBSD community about whether or not it was coming back. I think we should drop the package until that back and forth results in it being available again. Warner
On Fri, Jan 21, 2022 at 07:30:55AM -0700, Warner Losh wrote: > On Fri, Jan 21, 2022 at 4:47 AM Daniel P. Berrangé <berrange@redhat.com> > wrote: > > > On Fri, Jan 21, 2022 at 12:40:48PM +0100, Thomas Huth wrote: > > > On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: > > > > 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> > > > > --- > > > > .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- > > > > .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- > > > > 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 +- > > > > 9 files changed, 10 insertions(+), 11 deletions(-) > > > > > > > > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars > > b/.gitlab-ci.d/cirrus/freebsd-12.vars > > > > index 9c52266811f..bdcce578edf 100644 > > > > --- a/.gitlab-ci.d/cirrus/freebsd-12.vars > > > > +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars > > > > @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' > > > > NINJA='/usr/local/bin/ninja' > > > > PACKAGING_COMMAND='pkg' > > > > PIP3='/usr/local/bin/pip-3.8' > > > > -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache > > cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git > > glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs > > libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses > > nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy > > py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv > > py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract > > texinfo usbredir virglrenderer vte3 zstd' > > > > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache > > cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 > > gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt > > libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust > > lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf > > png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme > > py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy > > spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > > > > > > Aren't the FreeBSD jobs currently failing due to lttng-ust not being > > > available anymore? ... I'd somehow expected that this update might fix > > this, > > > too, but I still see lttng-ust in the list here? > > > > I had prepped an update to drop it, but @bsdimp indicated that it ought > > to be a transient problem so I never applied it, hoping it would fix > > itself. > > > > https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/211 > > > > It has been broken for ~2 weeks now though, and lttng-ust is not an > > especially critical feature so we should probably just go ahead and > > disable it regardless. > > > > I agree. I got some back and forth from the FreeBSD community about whether > or not > it was coming back. I think we should drop the package until that back and > forth results > in it being available again. The above change to remove lttng-ust is merged in libvirt-ci.git, so a sub-module update && make lcitool-refresh in QEMU will pull it in. Regards, Daniel
On 1/21/22 15:34, Daniel P. Berrangé wrote: > On Fri, Jan 21, 2022 at 07:30:55AM -0700, Warner Losh wrote: >> On Fri, Jan 21, 2022 at 4:47 AM Daniel P. Berrangé <berrange@redhat.com> >> wrote: >> >>> On Fri, Jan 21, 2022 at 12:40:48PM +0100, Thomas Huth wrote: >>>> On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: >>>>> 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> >>>>> --- >>>>> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- >>>>> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- >>>>> 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 +- >>>>> 9 files changed, 10 insertions(+), 11 deletions(-) >>>>> >>>>> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars >>> b/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> index 9c52266811f..bdcce578edf 100644 >>>>> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' >>>>> NINJA='/usr/local/bin/ninja' >>>>> PACKAGING_COMMAND='pkg' >>>>> PIP3='/usr/local/bin/pip-3.8' >>>>> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache >>> cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git >>> glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs >>> libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses >>> nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy >>> py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv >>> py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract >>> texinfo usbredir virglrenderer vte3 zstd' >>>>> +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache >>> cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 >>> gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt >>> libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust >>> lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf >>> png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme >>> py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy >>> spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' >>>> >>>> Aren't the FreeBSD jobs currently failing due to lttng-ust not being >>>> available anymore? ... I'd somehow expected that this update might fix >>> this, >>>> too, but I still see lttng-ust in the list here? >>> >>> I had prepped an update to drop it, but @bsdimp indicated that it ought >>> to be a transient problem so I never applied it, hoping it would fix >>> itself. >>> >>> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/211 >>> >>> It has been broken for ~2 weeks now though, and lttng-ust is not an >>> especially critical feature so we should probably just go ahead and >>> disable it regardless. >>> >> >> I agree. I got some back and forth from the FreeBSD community about whether >> or not >> it was coming back. I think we should drop the package until that back and >> forth results >> in it being available again. > > The above change to remove lttng-ust is merged in libvirt-ci.git, so > a sub-module update && make lcitool-refresh in QEMU will pull it in. Is that an implicit way to ask me to refresh and respin this series again? I already posted a v5... It looks like a never ending story with the submodule being updated and reducing patches churn. I'll post a v6 but if v7 is required I'll ask someone else to keep refreshing QEMU side. Thanks.
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811f..bdcce578edf 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 7b44dba324e..ee610c89fe1 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' 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