CI: Update riscv64 to use Debian Trixie

Everything works fine with Debian 13.  Provide two new build jobs, and update
both the randconfig the test jobs.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
Andrew Cooper committed 2025-09-10 17:30:22 +01:00
1 parent dc39962c78
commit aad6ebf059
4 files changed
+57 -5

No files matched your search

@@ -0,0 +1,37 @@
# syntax=docker/dockerfile:1
FROM --platform=linux/amd64 debian:trixie-slim
LABEL maintainer.name="The Xen Project"
LABEL maintainer.email="xen-devel@lists.xenproject.org"
ENV DEBIAN_FRONTEND=noninteractive
ENV CROSS_COMPILE=riscv64-linux-gnu-
ENV XEN_TARGET_ARCH=riscv64
RUN <<EOF
#!/bin/bash
set -e
useradd --create-home user
apt-get update
DEPS=(
# Xen
bison
build-essential
checkpolicy
flex
gcc-riscv64-linux-gnu
python3-minimal
# Qemu for test phase
qemu-system-riscv64
expect
)
apt-get -y --no-install-recommends install "${DEPS[@]}"
rm -rf /var/lib/apt/lists/*
EOF
USER user
WORKDIR /build
+18 -4
View File
@@ -329,10 +329,10 @@ debian-12-ppc64le-gcc-debug:
CONFIG_UBSAN=y
CONFIG_UBSAN_FATAL=y
debian-12-riscv64-gcc-debug:
debian-13-riscv64-gcc-debug:
extends: .gcc-riscv64-cross-build-debug
variables:
CONTAINER: debian:12-riscv64
CONTAINER: debian:13-riscv64
KBUILD_DEFCONFIG: tiny64_defconfig
HYPERVISOR_ONLY: y
EXTRA_XEN_CONFIG: |
@@ -713,6 +713,20 @@ debian-12-riscv64-gcc:
KBUILD_DEFCONFIG: tiny64_defconfig
HYPERVISOR_ONLY: y
debian-12-riscv64-gcc-debug:
extends: .gcc-riscv64-cross-build-debug
variables:
CONTAINER: debian:12-riscv64
KBUILD_DEFCONFIG: tiny64_defconfig
HYPERVISOR_ONLY: y
debian-13-riscv64-gcc:
extends: .gcc-riscv64-cross-build
variables:
CONTAINER: debian:13-riscv64
KBUILD_DEFCONFIG: tiny64_defconfig
HYPERVISOR_ONLY: y
.riscv-fixed-randconfig:
variables: &riscv-fixed-randconfig
EXTRA_FIXED_RANDCONFIG: |
@@ -725,10 +739,10 @@ debian-12-riscv64-gcc:
CONFIG_VM_EVENT=n
CONFIG_XSM=n
debian-12-riscv64-gcc-randconfig:
debian-13-riscv64-gcc-randconfig:
extends: .gcc-riscv64-cross-build
variables:
CONTAINER: debian:12-riscv64
CONTAINER: debian:13-riscv64
KBUILD_DEFCONFIG: tiny64_defconfig
RANDCONFIG: y
<<: *riscv-fixed-randconfig
+1 -1
View File
@@ -705,7 +705,7 @@ qemu-smoke-riscv64-gcc:
script:
- ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
needs:
- debian-12-riscv64-gcc-debug
- debian-13-riscv64-gcc-debug
qemu-smoke-ppc64le-powernv9-gcc:
extends: .qemu-ppc64le
+1
View File
@@ -32,6 +32,7 @@ case "_${CONTAINER}" in
_bullseye-ppc64le) CONTAINER="${BASE}/debian:11-ppc64le" ;;
_bookworm-ppc64le) CONTAINER="${BASE}/debian:12-ppc64le" ;;
_bookworm-riscv64) CONTAINER="${BASE}/debian:12-riscv64" ;;
_trixie-riscv64) CONTAINER="${BASE}/debian:13-riscv64" ;;
_bookworm-x86_64-gcc-ibt) CONTAINER="${BASE}/debian:12-x86_64-gcc-ibt" ;;
_bookworm|_bookworm-x86_64|_) CONTAINER="${BASE}/debian:12-x86_64" ;;
_bookworm-i386|_bookworm-x86_32) CONTAINER="${BASE}/debian:12-x86_32" ;;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.