| Message ID | 20230914155422.426639-2-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next: avocado, gitlab, docker, cirrus | expand |
On 14/09/2023 17.54, Alex Bennée wrote: > Bookworm has been out a while now. Time to update our containers to > the current stable. This requires the latest lcitool repo so update > the sub-module too. > > For some reason the MIPs containers won't build so skip those for now. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .../dockerfiles/debian-amd64-cross.docker | 10 +++------- > tests/docker/dockerfiles/debian-amd64.docker | 10 +++------- > .../dockerfiles/debian-arm64-cross.docker | 10 +++------- > .../dockerfiles/debian-armel-cross.docker | 10 +++------- > .../dockerfiles/debian-armhf-cross.docker | 10 +++------- > .../dockerfiles/debian-ppc64el-cross.docker | 10 +++------- > .../dockerfiles/debian-s390x-cross.docker | 10 +++------- > tests/docker/dockerfiles/ubuntu2004.docker | 2 +- > tests/docker/dockerfiles/ubuntu2204.docker | 2 +- > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 18 +++++++++--------- > 11 files changed, 33 insertions(+), 61 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 14/9/23 17:54, Alex Bennée wrote: > Bookworm has been out a while now. Time to update our containers to > the current stable. This requires the latest lcitool repo so update > the sub-module too. > > For some reason the MIPs containers won't build so skip those for now. Debian removed mipsel: https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html https://lists.debian.org/debian-release/2019/08/msg00582.html ... > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .../dockerfiles/debian-amd64-cross.docker | 10 +++------- > tests/docker/dockerfiles/debian-amd64.docker | 10 +++------- > .../dockerfiles/debian-arm64-cross.docker | 10 +++------- > .../dockerfiles/debian-armel-cross.docker | 10 +++------- > .../dockerfiles/debian-armhf-cross.docker | 10 +++------- > .../dockerfiles/debian-ppc64el-cross.docker | 10 +++------- > .../dockerfiles/debian-s390x-cross.docker | 10 +++------- > tests/docker/dockerfiles/ubuntu2004.docker | 2 +- > tests/docker/dockerfiles/ubuntu2204.docker | 2 +- > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 18 +++++++++--------- > 11 files changed, 33 insertions(+), 61 deletions(-) > @@ -133,24 +133,24 @@ try: > # > # Cross compiling builds > # > - generate_dockerfile("debian-amd64-cross", "debian-11", > + generate_dockerfile("debian-amd64-cross", "debian-12", > cross="x86_64", > trailer=cross_build("x86_64-linux-gnu-", > "x86_64-softmmu," > "x86_64-linux-user," > "i386-softmmu,i386-linux-user")) > > - generate_dockerfile("debian-arm64-cross", "debian-11", > + generate_dockerfile("debian-arm64-cross", "debian-12", > cross="aarch64", > trailer=cross_build("aarch64-linux-gnu-", > "aarch64-softmmu,aarch64-linux-user")) > > - generate_dockerfile("debian-armel-cross", "debian-11", > + generate_dockerfile("debian-armel-cross", "debian-12", > cross="armv6l", > trailer=cross_build("arm-linux-gnueabi-", > "arm-softmmu,arm-linux-user,armeb-linux-user")) > > - generate_dockerfile("debian-armhf-cross", "debian-11", > + generate_dockerfile("debian-armhf-cross", "debian-12", > cross="armv7l", > trailer=cross_build("arm-linux-gnueabihf-", > "arm-softmmu,arm-linux-user")) > @@ -165,7 +165,7 @@ try: ... so we have to keep bullseye here: > generate_dockerfile("debian-mipsel-cross", "debian-11", > trailer=cross_build("mipsel-linux-gnu-", > "mipsel-softmmu,mipsel-linux-user")) but the mips64el should work: generate_dockerfile("debian-mips64el-cross", "debian-12", cross="mips64el", ... Anyhow, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Fri, Sep 15, 2023 at 11:14:29AM +0200, Philippe Mathieu-Daudé wrote: > On 14/9/23 17:54, Alex Bennée wrote: > > Bookworm has been out a while now. Time to update our containers to > > the current stable. This requires the latest lcitool repo so update > > the sub-module too. > > > > For some reason the MIPs containers won't build so skip those for now. > > Debian removed mipsel: > https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html > https://lists.debian.org/debian-release/2019/08/msg00582.html ... Wwith our general aim to support latest release, plus the previous release (capped to a maximum of 2 years), we can still consider mipsel supportable in QEMU CI by sticking with oldstable (Bullseye) for the mipsel containers. Once Debian 13 comes out, however, we'll be discarding Bullseye from CI and so we'll be unable to do CI for mipsel. At the very least this means we'll consider mipsel to be downgraded in terms of supportability when that happens. We might then consider explicitly dropping it as a buld target entirely, as the writing is on the wall for 32-bit OS platforms in general... With regards, Daniel
On 15/9/23 11:24, Daniel P. Berrangé wrote: > On Fri, Sep 15, 2023 at 11:14:29AM +0200, Philippe Mathieu-Daudé wrote: >> On 14/9/23 17:54, Alex Bennée wrote: >>> Bookworm has been out a while now. Time to update our containers to >>> the current stable. This requires the latest lcitool repo so update >>> the sub-module too. >>> >>> For some reason the MIPs containers won't build so skip those for now. >> >> Debian removed mipsel: >> https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html >> https://lists.debian.org/debian-release/2019/08/msg00582.html ... > > Wwith our general aim to support latest release, plus the previous > release (capped to a maximum of 2 years), we can still consider > mipsel supportable in QEMU CI by sticking with oldstable (Bullseye) > for the mipsel containers. > > Once Debian 13 comes out, however, we'll be discarding Bullseye > from CI and so we'll be unable to do CI for mipsel. At the very > least this means we'll consider mipsel to be downgraded in terms > of supportability when that happens. We might then consider > explicitly dropping it as a buld target entirely, as the writing > is on the wall for 32-bit OS platforms in general... I'm fine with dropping system emulation on 32-bit hosts, but a bit reluctant to drop user emulation there. Anyhow I agree with our distrib releases support rules, so the mipsel buildsys part is effectively condemned.
On 15/09/2023 12.53, Philippe Mathieu-Daudé wrote: > On 15/9/23 11:24, Daniel P. Berrangé wrote: >> On Fri, Sep 15, 2023 at 11:14:29AM +0200, Philippe Mathieu-Daudé wrote: >>> On 14/9/23 17:54, Alex Bennée wrote: >>>> Bookworm has been out a while now. Time to update our containers to >>>> the current stable. This requires the latest lcitool repo so update >>>> the sub-module too. >>>> >>>> For some reason the MIPs containers won't build so skip those for now. >>> >>> Debian removed mipsel: >>> https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html >>> https://lists.debian.org/debian-release/2019/08/msg00582.html ... >> >> Wwith our general aim to support latest release, plus the previous >> release (capped to a maximum of 2 years), we can still consider >> mipsel supportable in QEMU CI by sticking with oldstable (Bullseye) >> for the mipsel containers. >> >> Once Debian 13 comes out, however, we'll be discarding Bullseye >> from CI and so we'll be unable to do CI for mipsel. At the very >> least this means we'll consider mipsel to be downgraded in terms >> of supportability when that happens. We might then consider >> explicitly dropping it as a buld target entirely, as the writing >> is on the wall for 32-bit OS platforms in general... > > I'm fine with dropping system emulation on 32-bit hosts, but a bit > reluctant to drop user emulation there. Anyhow I agree with our > distrib releases support rules, so the mipsel buildsys part is > effectively condemned. Could you maybe send a patch for docs/about/deprecated.rst to make this clear for the users, too? Thanks, Thomas
On Fri, Sep 15, 2023 at 12:53:30PM +0200, Philippe Mathieu-Daudé wrote: > On 15/9/23 11:24, Daniel P. Berrangé wrote: > > On Fri, Sep 15, 2023 at 11:14:29AM +0200, Philippe Mathieu-Daudé wrote: > > > On 14/9/23 17:54, Alex Bennée wrote: > > > > Bookworm has been out a while now. Time to update our containers to > > > > the current stable. This requires the latest lcitool repo so update > > > > the sub-module too. > > > > > > > > For some reason the MIPs containers won't build so skip those for now. > > > > > > Debian removed mipsel: > > > https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html > > > https://lists.debian.org/debian-release/2019/08/msg00582.html ... > > > > Wwith our general aim to support latest release, plus the previous > > release (capped to a maximum of 2 years), we can still consider > > mipsel supportable in QEMU CI by sticking with oldstable (Bullseye) > > for the mipsel containers. > > > > Once Debian 13 comes out, however, we'll be discarding Bullseye > > from CI and so we'll be unable to do CI for mipsel. At the very > > least this means we'll consider mipsel to be downgraded in terms > > of supportability when that happens. We might then consider > > explicitly dropping it as a buld target entirely, as the writing > > is on the wall for 32-bit OS platforms in general... > > I'm fine with dropping system emulation on 32-bit hosts, but a bit > reluctant to drop user emulation there. Anyhow I agree with our > distrib releases support rules, so the mipsel buildsys part is > effectively condemned. I wouldn't say condemned, because we are free to continue including mipsel code in QEMU if we desire - we just will be unable to guarantee that it works correctly - we'd be relying on developers and users to report bugs and test it on whatever distro thye happen to still have working. Cutting it back to just user emulation is a reasonable thing - testing user mode guest is not locked into our support matrix, so we can easily test user mode binaries via ancient distros if desired. With regards, Daniel
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index b66b9cc191..abbf45d402 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-x86-64-linux-gnu \ gcc-x86-64-linux-gnu \ libaio-dev:amd64 \ - libasan5:amd64 \ + libasan6:amd64 \ libasound2-dev:amd64 \ libattr1-dev:amd64 \ libbpf-dev:amd64 \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 02262bc70e..a60afa2166 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all debian-11 qemu +# $ lcitool dockerfile --layers all debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libaio-dev \ - libasan5 \ + libasan6 \ libasound2-dev \ libattr1-dev \ libbpf-dev \ @@ -115,11 +115,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -145,8 +143,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index a0a968b8c6..64cf42728b 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \ libaio-dev:arm64 \ - libasan5:arm64 \ + libasan6:arm64 \ libasound2-dev:arm64 \ libattr1-dev:arm64 \ libbpf-dev:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index f1fc34a28a..de72903fb2 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch armv6l debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-arm-linux-gnueabi \ gcc-arm-linux-gnueabi \ libaio-dev:armel \ - libasan5:armel \ + libasan6:armel \ libasound2-dev:armel \ libattr1-dev:armel \ libbpf-dev:armel \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index a278578211..2274f3d005 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch armv7l debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch armv7l debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \ libaio-dev:armhf \ - libasan5:armhf \ + libasan6:armhf \ libasound2-dev:armhf \ libattr1-dev:armhf \ libbpf-dev:armhf \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 30e5efa986..bb9e88c7b3 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-powerpc64le-linux-gnu \ gcc-powerpc64le-linux-gnu \ libaio-dev:ppc64el \ - libasan5:ppc64el \ + libasan6:ppc64el \ libasound2-dev:ppc64el \ libattr1-dev:ppc64el \ libbpf-dev:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index ee6db7b526..503d466dbc 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch s390x debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch s390x debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ @@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ g++-s390x-linux-gnu \ gcc-s390x-linux-gnu \ libaio-dev:s390x \ - libasan5:s390x \ + libasan6:s390x \ libasound2-dev:s390x \ libattr1-dev:s390x \ libbpf-dev:s390x \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 4180cd8674..d3e212060c 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libaio-dev \ - libasan5 \ + libasan6 \ libasound2-dev \ libattr1-dev \ libbrlapi-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 88493f00f6..94c2c16118 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ hostname \ libaio-dev \ - libasan5 \ + libasan6 \ libasound2-dev \ libattr1-dev \ libbpf-dev \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index bbd55b4d18..e6c1d040f6 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634 +Subproject commit e6c1d040f66e5badf4bd1ab54d98a534c6510f5e diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4584870ea1..8b1adfbdfb 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -93,7 +93,7 @@ def generate_pkglist(vm, target): # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test -debian11_extras = [ +debian12_extras = [ "# netmap/cscope/global\n", "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n", " apt install -y --no-install-recommends \\\n", @@ -123,8 +123,8 @@ try: # generate_dockerfile("alpine", "alpine-318") generate_dockerfile("centos8", "centos-stream-8") - generate_dockerfile("debian-amd64", "debian-11", - trailer="".join(debian11_extras)) + generate_dockerfile("debian-amd64", "debian-12", + trailer="".join(debian12_extras)) generate_dockerfile("fedora", "fedora-38") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") @@ -133,24 +133,24 @@ try: # # Cross compiling builds # - generate_dockerfile("debian-amd64-cross", "debian-11", + generate_dockerfile("debian-amd64-cross", "debian-12", cross="x86_64", trailer=cross_build("x86_64-linux-gnu-", "x86_64-softmmu," "x86_64-linux-user," "i386-softmmu,i386-linux-user")) - generate_dockerfile("debian-arm64-cross", "debian-11", + generate_dockerfile("debian-arm64-cross", "debian-12", cross="aarch64", trailer=cross_build("aarch64-linux-gnu-", "aarch64-softmmu,aarch64-linux-user")) - generate_dockerfile("debian-armel-cross", "debian-11", + generate_dockerfile("debian-armel-cross", "debian-12", cross="armv6l", trailer=cross_build("arm-linux-gnueabi-", "arm-softmmu,arm-linux-user,armeb-linux-user")) - generate_dockerfile("debian-armhf-cross", "debian-11", + generate_dockerfile("debian-armhf-cross", "debian-12", cross="armv7l", trailer=cross_build("arm-linux-gnueabihf-", "arm-softmmu,arm-linux-user")) @@ -165,7 +165,7 @@ try: trailer=cross_build("mipsel-linux-gnu-", "mipsel-softmmu,mipsel-linux-user")) - generate_dockerfile("debian-ppc64el-cross", "debian-11", + generate_dockerfile("debian-ppc64el-cross", "debian-12", cross="ppc64le", trailer=cross_build("powerpc64le-linux-gnu-", "ppc64-softmmu,ppc64-linux-user")) @@ -176,7 +176,7 @@ try: trailer=cross_build("riscv64-linux-gnu-", "riscv64-softmmu,riscv64-linux-user")) - generate_dockerfile("debian-s390x-cross", "debian-11", + generate_dockerfile("debian-s390x-cross", "debian-12", cross="s390x", trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user"))
Bookworm has been out a while now. Time to update our containers to the current stable. This requires the latest lcitool repo so update the sub-module too. For some reason the MIPs containers won't build so skip those for now. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .../dockerfiles/debian-amd64-cross.docker | 10 +++------- tests/docker/dockerfiles/debian-amd64.docker | 10 +++------- .../dockerfiles/debian-arm64-cross.docker | 10 +++------- .../dockerfiles/debian-armel-cross.docker | 10 +++------- .../dockerfiles/debian-armhf-cross.docker | 10 +++------- .../dockerfiles/debian-ppc64el-cross.docker | 10 +++------- .../dockerfiles/debian-s390x-cross.docker | 10 +++------- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/docker/dockerfiles/ubuntu2204.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 18 +++++++++--------- 11 files changed, 33 insertions(+), 61 deletions(-)