With the exception of the custom IBT job, copy all Debian 12 jobs making Debian 13 versions, then trim the Debian 12 ranconfig jobs.
Update the test jobs using Debian 12 to use 13. Signed-off-by: Andrew Cooper <[email protected]> Reviewed-by: Denis Mukhin <[email protected]> --- CC: Anthony PERARD <[email protected]> CC: Michal Orzel <[email protected]> CC: Jan Beulich <[email protected]> CC: Julien Grall <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Shawn Anastasio <[email protected]> CC: Oleksii Kurochko <[email protected]> CC: Doug Goldstein <[email protected]> CC: Marek Marczykowski-Górecki <[email protected]> CC: Victor Lira <[email protected]> v3: * Update .qemu-x86-64 too. * Rebase over cleanup to 12-x86_64 v2: * Make 13-x86_64 be root-less * Update containerize --- ...x86_32.dockerfile => 13-x86_32.dockerfile} | 2 +- ...x86_64.dockerfile => 13-x86_64.dockerfile} | 2 +- automation/gitlab-ci/build.yaml | 54 ++++++++++++++----- automation/gitlab-ci/test.yaml | 12 ++--- automation/scripts/containerize | 3 +- 5 files changed, 52 insertions(+), 21 deletions(-) copy automation/build/debian/{12-x86_32.dockerfile => 13-x86_32.dockerfile} (95%) copy automation/build/debian/{12-x86_64.dockerfile => 13-x86_64.dockerfile} (96%) diff --git a/automation/build/debian/12-x86_32.dockerfile b/automation/build/debian/13-x86_32.dockerfile similarity index 95% copy from automation/build/debian/12-x86_32.dockerfile copy to automation/build/debian/13-x86_32.dockerfile index 447152d7e5e4..464b4fc55e38 100644 --- a/automation/build/debian/12-x86_32.dockerfile +++ b/automation/build/debian/13-x86_32.dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM --platform=linux/i386 debian:bookworm +FROM --platform=linux/i386 debian:trixie-slim LABEL maintainer.name="The Xen Project" LABEL maintainer.email="[email protected]" diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/13-x86_64.dockerfile similarity index 96% copy from automation/build/debian/12-x86_64.dockerfile copy to automation/build/debian/13-x86_64.dockerfile index 4e533ee879fd..2c6c9d4a5098 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/13-x86_64.dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bookworm +FROM --platform=linux/amd64 debian:trixie-slim LABEL maintainer.name="The Xen Project" LABEL maintainer.email="[email protected]" diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index f8e45f3467c8..4cb52fe59715 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -309,15 +309,15 @@ alpine-3.18-gcc-debug: CONFIG_UCODE_SCAN_DEFAULT=y CONFIG_XHCI=y -debian-12-x86_64-gcc-debug: +debian-13-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 -debian-12-x86_64-clang-debug: +debian-13-x86_64-clang-debug: extends: .clang-x86-64-build-debug variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 debian-13-ppc64le-gcc-debug: extends: .gcc-ppc64le-cross-build-debug @@ -545,24 +545,20 @@ debian-12-x86_64-clang: variables: CONTAINER: debian:12-x86_64 -debian-12-x86_64-clang-randconfig: - extends: .clang-x86-64-build +debian-12-x86_64-clang-debug: + extends: .clang-x86-64-build-debug variables: CONTAINER: debian:12-x86_64 - RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: | - CONFIG_COVERAGE=n # Disable coverage otherwise build times out. debian-12-x86_64-gcc: extends: .gcc-x86-64-build variables: CONTAINER: debian:12-x86_64 -debian-12-x86_64-gcc-randconfig: - extends: .gcc-x86-64-build +debian-12-x86_64-gcc-debug: + extends: .gcc-x86-64-build-debug variables: CONTAINER: debian:12-x86_64 - RANDCONFIG: y debian-12-x86_32-clang-debug: extends: .clang-x86-32-build-debug @@ -574,6 +570,40 @@ debian-12-x86_32-gcc-debug: variables: CONTAINER: debian:12-x86_32 +debian-13-x86_64-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + +debian-13-x86_64-clang-randconfig: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_COVERAGE=n # Disable coverage otherwise build times out. + +debian-13-x86_64-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + +debian-13-x86_64-gcc-randconfig: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + RANDCONFIG: y + +debian-13-x86_32-clang-debug: + extends: .clang-x86-32-build-debug + variables: + CONTAINER: debian:13-x86_32 + +debian-13-x86_32-gcc-debug: + extends: .gcc-x86-32-build-debug + variables: + CONTAINER: debian:13-x86_32 + fedora-41-x86_64-gcc: extends: .gcc-x86-64-build variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index e8946e15dc3a..8d8f62c8d04d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -59,7 +59,7 @@ .qemu-x86-64: extends: .test-jobs-common variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 LOGFILE: qemu-smoke-x86-64.log artifacts: paths: @@ -661,35 +661,35 @@ qemu-smoke-x86-64-gcc: script: - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug qemu-smoke-x86-64-clang: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE} needs: - - debian-12-x86_64-clang-debug + - debian-13-x86_64-clang-debug qemu-smoke-x86-64-gcc-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug qemu-smoke-x86-64-clang-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE} needs: - - debian-12-x86_64-clang-debug + - debian-13-x86_64-clang-debug qemu-smoke-x86-64-gcc-efi: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64-efi pv64 example 2>&1 | tee ${LOGFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug qemu-xtf-argo-x86_64-gcc-debug: extends: .qemu-smoke-x86-64 diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 65c8804ce5f3..743567cb772a 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -35,7 +35,8 @@ case "_${CONTAINER}" in _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|_bookworm-x86_64) CONTAINER="${BASE}/debian:12-x86_64" ;; + _trixie-x86_64|_) CONTAINER="${BASE}/debian:13-x86_64" ;; _bookworm-i386|_bookworm-x86_32) CONTAINER="${BASE}/debian:12-x86_32" ;; _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;; _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;; -- 2.39.5
