Re: [PATCH 4/5] CI: Add a Debian 13 (Trixie) arm64 container

["Orzel, Michal" <michal.orzel@xxxxxxx>]

On 08-May-26 23:29, Andrew Cooper wrote:
> Exactly as per the Bookworm container, but additionally with the ipxe-qemu and
> qemu-system-aarch64 packages.  These will be used to remove the export jobs.
> 
> Switch qemu-arm{32,64} jobs to use this container.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Michal Orzel <michal.orzel@xxxxxxx>
> CC: Doug Goldstein <cardoe@xxxxxxxxxx>
> 
> We should probably wire up some build tests too, but it's too late on a Friday
> for me to be thinking about that for this posting.
> ---
>  automation/build/debian/13-arm64v8.dockerfile | 71 +++++++++++++++++++
>  automation/gitlab-ci/test.yaml                |  4 +-
>  automation/scripts/containerize               |  1 +
>  3 files changed, 74 insertions(+), 2 deletions(-)
>  create mode 100644 automation/build/debian/13-arm64v8.dockerfile
> 
> diff --git a/automation/build/debian/13-arm64v8.dockerfile 
> b/automation/build/debian/13-arm64v8.dockerfile
> new file mode 100644
> index 000000000000..b9062ee8b443
> --- /dev/null
> +++ b/automation/build/debian/13-arm64v8.dockerfile
> @@ -0,0 +1,71 @@
> +# syntax=docker/dockerfile:1
> +FROM --platform=linux/arm64/v8 debian:trixie-slim
> +LABEL maintainer.name="The Xen Project"
> +LABEL maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
> +
> +ENV DEBIAN_FRONTEND=noninteractive
> +
> +RUN <<EOF
> +#!/bin/bash
> +    set -eu
> +
> +    useradd --create-home user
> +
> +    apt-get update
> +
> +    DEPS=(
> +        # Xen
> +        bison
> +        build-essential
> +        checkpolicy
> +        flex
> +
> +        # Tools (general)
> +        ca-certificates
> +        cpio
> +        git-core
> +        pkg-config
> +        wget
> +        # libxenguest dombuilder
> +        libbz2-dev
> +        liblzma-dev
> +        liblzo2-dev
> +        libzstd-dev
> +        zlib1g-dev
> +        # libacpi
> +        acpica-tools
> +        # libxl
> +        libfdt-dev
> +        libjson-c-dev
> +        uuid-dev
> +        # xentop
> +        libncurses5-dev
> +        # Python bindings
> +        python3-dev
> +        python3-setuptools
> +        # Golang bindings
> +        golang-go
> +        # Ocaml bindings/oxenstored
> +        ocaml-nox
> +        ocaml-findlib
Since this is a container used only for tests, why listing packages required for
Xen and tools build?

> +
> +        # for test phase, qemu-* jobs
> +        busybox-static
> +        curl
> +        device-tree-compiler
> +        expect
> +        file
> +        ipxe-qemu
> +        ovmf
> +        qemu-system-aarch64
> +        u-boot-qemu
> +        u-boot-tools
So after this change, even though you replace debian-12 with debian-13 for all
the tests, the debian-12 still contains the unneeded packages (i.e. for a test
phase that it no longer runs).

~Michal

> +    )
> +
> +    apt-get -y --no-install-recommends install "${DEPS[@]}"
> +
> +    rm -rf /var/lib/apt/lists*
> +EOF
> +
> +USER user
> +WORKDIR /build
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 982fd86db079..008deef98d1e 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -37,7 +37,7 @@
>  .qemu-arm64:
>    extends: .test-jobs-common
>    variables:
> -    CONTAINER: debian:12-arm64v8
> +    CONTAINER: debian:13-arm64v8
>      LOGFILE: qemu-smoke-arm64.log
>    artifacts:
>      paths:
> @@ -50,7 +50,7 @@
>  .qemu-arm32:
>    extends: .test-jobs-common
>    variables:
> -    CONTAINER: debian:12-arm64v8
> +    CONTAINER: debian:13-arm64v8
>      LOGFILE: qemu-smoke-arm32.log
>    artifacts:
>      paths:
> diff --git a/automation/scripts/containerize b/automation/scripts/containerize
> index bda06054ebde..8bd2a847aac0 100755
> --- a/automation/scripts/containerize
> +++ b/automation/scripts/containerize
> @@ -41,6 +41,7 @@ case "_${CONTAINER}" in
>      _bookworm-arm64v8-arm32) CONTAINER="${BASE}/debian:12-arm64v8-arm32" ;;
>      _bookworm-arm64v8) CONTAINER="${BASE}/debian:12-arm64v8" ;;
>      _bookworm-cppcheck) CONTAINER="${BASE}/debian:12-arm64v8-cppcheck" ;;
> +    _trixie-arm64v8) CONTAINER="${BASE}/debian:13-arm64v8" ;;
>      _opensuse-leap|_leap) CONTAINER="${BASE}/opensuse:leap-15.6-x86_64" ;;
>      _opensuse-tumbleweed|_tumbleweed) 
> CONTAINER="${BASE}/opensuse:tumbleweed-x86_64" ;;
>      _xenial) CONTAINER="${BASE}/ubuntu:16.04-x86_64" ;;