[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v3 1/6] CI: add a Debian 13 riscv64 QTB container





On 11/3/26 3:08 PM, Baptiste Le Duc wrote:
The riscv64 QTB tests use QTB (QEMU Test Bench) Python package. QTB is part
of AMD's work on the 'safety' branch [1] of their QEMU fork and is not
upstream in QEMU yet. The tests also need pytest and qemu-system-riscv64.

Add debian:13-riscv64-qtb, a Debian Trixie container with those packages
and the QTB package installed from the python/ directory of AMD's QEMU
fork, at the commit pinned by QEMU_REPO/QEMU_COMMIT. Make it available to
containerize script as trixie-riscv64-qtb.

QTB depends on pexpect, ptyprocess, pygdbmi and qemu.qmp. Rather than
fetching them from PyPI, install them from the wheels vendored in the
python/wheels/ directory of the same fork commit, with pip --no-index.

[1] https://gitlab.com/xen-project/people/amd/qemu/-/tree/safety?ref_type=heads

Suggested-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Baptiste Le Duc <baptiste.le-duc@xxxxxxxxxx>
---
The CI jobs running the tests in this container come in a later patch.
---
Changes in v3:
- Move the container from test-artifacts to xen.git (automation/build/),
   renamed debian:13-riscv64-qtb.
- Install the QTB dependencies from the wheels vendored in the fork, with
   pip --no-index.
- Add pytest, drop jinja2, yaml and device-tree-compiler.
- Comment that the pinned commit is the tip of the safety branch.
- Reword the commit title and message.
---
  automation/build/debian/13-riscv64-qtb.dockerfile | 47 +++++++++++++++++++++++
  automation/scripts/containerize                   |  1 +
  2 files changed, 48 insertions(+)

diff --git a/automation/build/debian/13-riscv64-qtb.dockerfile 
b/automation/build/debian/13-riscv64-qtb.dockerfile
new file mode 100644
index 0000000000..34ca1f2b7d
--- /dev/null
+++ b/automation/build/debian/13-riscv64-qtb.dockerfile
@@ -0,0 +1,47 @@
+# syntax=docker/dockerfile:1
+FROM --platform=linux/amd64 debian:trixie-slim
+LABEL maintainer.name="The Xen Project"
+LABEL maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+ARG QEMU_REPO=https://gitlab.com/xen-project/people/amd/qemu.git
+# Tip of the safety branch
+ARG QEMU_COMMIT=24cd7e5c0d7e4db8e651f091d0b9da2e7c58dbab
+
+RUN <<EOF
+#!/bin/bash
+    set -eu
+
+    useradd --create-home user
+
+    apt-get update
+
+    DEPS=(# Base environment
+        ca-certificates
+        git
+        python3-minimal
+        python3-pip

Nit: the other dockerfiles put the comment on its own line after "DEPS=(".
Also, python3-pip already pulls in python3, so python3-minimal looks
redundant.

Other LGTM:
 Reviewed-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>

I've also tested it by:

$ podman build -t qtb-review -f automation/build/debian/13-riscv64-qtb.dockerfile automation/build/debian

And it looks everything is on the place so:

Tested-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>

~ Oleksii



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.