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.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Anthony PERARD <anthony.per...@vates.tech> CC: Michal Orzel <michal.or...@amd.com> CC: Jan Beulich <jbeul...@suse.com> CC: Julien Grall <jul...@xen.org> CC: Roger Pau Monné <roger....@citrix.com> CC: Stefano Stabellini <sstabell...@kernel.org> CC: Shawn Anastasio <sanasta...@raptorengineering.com> CC: Oleksii Kurochko <oleksii.kuroc...@gmail.com> CC: Doug Goldstein <car...@cardoe.com> CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com> CC: Victor Lira <victorm.l...@amd.com> https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1975958452 We may want to trim a few more jobs, but I'm not sure where the right balance is. --- automation/gitlab-ci/build.yaml | 54 +++++++++++++++++++++++++-------- automation/gitlab-ci/test.yaml | 10 +++--- 2 files changed, 47 insertions(+), 17 deletions(-) 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 9acd984d294c..96e952235737 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -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 -- 2.39.5
