Everything works fine with Debian 13. Provide two new build jobs (for a total
of 6), and update the test jobs.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Denis Mukhin <dmukhin@ford.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Victor Lira <victorm.lira@amd.com>
v3:
* Update .qemu-ppc64le template too
v2:
* Update containerize
---
...pc64le.dockerfile => 13-ppc64le.dockerfile} | 2 +-
automation/gitlab-ci/build.yaml | 18 ++++++++++++++++--
automation/gitlab-ci/test.yaml | 4 ++--
automation/scripts/containerize | 1 +
4 files changed, 20 insertions(+), 5 deletions(-)
copy automation/build/debian/{12-ppc64le.dockerfile => 13-ppc64le.dockerfile} (93%)
diff --git a/automation/build/debian/12-ppc64le.dockerfile b/automation/build/debian/13-ppc64le.dockerfile
similarity index 93%
copy from automation/build/debian/12-ppc64le.dockerfile
copy to automation/build/debian/13-ppc64le.dockerfile
index da518aab4e10..5b22a4545842 100644
--- a/automation/build/debian/12-ppc64le.dockerfile
+++ b/automation/build/debian/13-ppc64le.dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 debian:bookworm-slim
+FROM --platform=linux/amd64 debian:trixie-slim
LABEL maintainer.name="The Xen Project"
LABEL maintainer.email="xen-devel@lists.xenproject.org"
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index c0728e58c48b..f8e45f3467c8 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -319,10 +319,10 @@ debian-12-x86_64-clang-debug:
variables:
CONTAINER: debian:12-x86_64
-debian-12-ppc64le-gcc-debug:
+debian-13-ppc64le-gcc-debug:
extends: .gcc-ppc64le-cross-build-debug
variables:
- CONTAINER: debian:12-ppc64le
+ CONTAINER: debian:13-ppc64le
KBUILD_DEFCONFIG: ppc64_defconfig
HYPERVISOR_ONLY: y
EXTRA_XEN_CONFIG: |
@@ -705,6 +705,20 @@ debian-12-ppc64le-gcc:
KBUILD_DEFCONFIG: ppc64_defconfig
HYPERVISOR_ONLY: y
+debian-12-ppc64le-gcc-debug:
+ extends: .gcc-ppc64le-cross-build-debug
+ variables:
+ CONTAINER: debian:12-ppc64le
+ KBUILD_DEFCONFIG: ppc64_defconfig
+ HYPERVISOR_ONLY: y
+
+debian-13-ppc64le-gcc:
+ extends: .gcc-ppc64le-cross-build
+ variables:
+ CONTAINER: debian:13-ppc64le
+ KBUILD_DEFCONFIG: ppc64_defconfig
+ HYPERVISOR_ONLY: y
+
# RISC-V 64 cross-build
debian-12-riscv64-gcc:
extends: .gcc-riscv64-cross-build
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 1de68a0fe450..e8946e15dc3a 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -90,7 +90,7 @@
.qemu-ppc64le:
extends: .test-jobs-common
variables:
- CONTAINER: debian:12-ppc64le
+ CONTAINER: debian:13-ppc64le
LOGFILE: qemu-smoke-ppc64le.log
artifacts:
paths:
@@ -712,4 +712,4 @@ qemu-smoke-ppc64le-powernv9-gcc:
script:
- ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE}
needs:
- - debian-12-ppc64le-gcc-debug
+ - debian-13-ppc64le-gcc-debug
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 340b6caaab44..65c8804ce5f3 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -31,6 +31,7 @@ case "_${CONTAINER}" in
_fedora) CONTAINER="${BASE}/fedora:41-x86_64";;
_bullseye-ppc64le) CONTAINER="${BASE}/debian:11-ppc64le" ;;
_bookworm-ppc64le) CONTAINER="${BASE}/debian:12-ppc64le" ;;
+ _trixie-ppc64le) CONTAINER="${BASE}/debian:13-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" ;;
--
2.39.5