From: Roger Pau Monne <roger.pau@citrix.com>
Date: Wed, 5 Apr 2023 13:31:17 +0000 (+0200)
Subject: (no commit message)
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Ftest-script4;p=people%2Froyger%2Fxen.git

---

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 8308b69f7d..113c04db50 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -36,223 +36,223 @@
   variables:
     debug: n
 
-.x86-64-build-debug:
-  extends: .x86-64-build-tmpl
-  variables:
-    debug: y
-
-.x86-32-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: x86_32
-  tags:
-    - x86_32
-
-.x86-32-build:
-  extends: .x86-32-build-tmpl
-  variables:
-    debug: n
-
-.x86-32-build-debug:
-  extends: .x86-32-build-tmpl
-  variables:
-    debug: y
+# .x86-64-build-debug:
+#   extends: .x86-64-build-tmpl
+#   variables:
+#     debug: y
+# 
+# .x86-32-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: x86_32
+#   tags:
+#     - x86_32
+# 
+# .x86-32-build:
+#   extends: .x86-32-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .x86-32-build-debug:
+#   extends: .x86-32-build-tmpl
+#   variables:
+#     debug: y
 
 .gcc-x86-64-build:
   extends: .x86-64-build
   variables:
     <<: *gcc
 
-.gcc-x86-64-build-debug:
-  extends: .x86-64-build-debug
-  variables:
-    <<: *gcc
-
-.gcc-x86-32-build:
-  extends: .x86-32-build
-  variables:
-    <<: *gcc
-
-.gcc-x86-32-build-debug:
-  extends: .x86-32-build-debug
-  variables:
-    <<: *gcc
-
-.clang-x86-64-build:
-  extends: .x86-64-build
-  variables:
-    <<: *clang
-
-.clang-x86-64-build-debug:
-  extends: .x86-64-build-debug
-  variables:
-    <<: *clang
-
-.clang-x86-32-build:
-  extends: .x86-32-build
-  variables:
-    <<: *clang
-
-.clang-x86-32-build-debug:
-  extends: .x86-32-build-debug
-  variables:
-    <<: *clang
-
-.arm32-cross-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: arm32
-  tags:
-    - arm64
-
-.arm32-cross-build:
-  extends: .arm32-cross-build-tmpl
-  variables:
-    debug: n
-
-.arm32-cross-build-debug:
-  extends: .arm32-cross-build-tmpl
-  variables:
-    debug: y
-
-.gcc-arm32-cross-build:
-  extends: .arm32-cross-build
-  variables:
-    <<: *gcc
-
-.gcc-arm32-cross-build-debug:
-  extends: .arm32-cross-build-debug
-  variables:
-    <<: *gcc
-
-.arm64-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: arm64
-  tags:
-    - arm64
-
-.arm64-build:
-  extends: .arm64-build-tmpl
-  variables:
-    debug: n
-
-.arm64-build-debug:
-  extends: .arm64-build-tmpl
-  variables:
-    debug: y
-
-.gcc-arm64-build:
-  extends: .arm64-build
-  variables:
-    <<: *gcc
-
-.gcc-arm64-build-debug:
-  extends: .arm64-build-debug
-  variables:
-    <<: *gcc
-
-.riscv64-cross-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: riscv64
-  tags:
-    - x86_64
-
-.riscv64-cross-build:
-  extends: .riscv64-cross-build-tmpl
-  variables:
-    debug: n
-
-.riscv64-cross-build-debug:
-  extends: .riscv64-cross-build-tmpl
-  variables:
-    debug: y
-
-.gcc-riscv64-cross-build:
-  extends: .riscv64-cross-build
-  variables:
-    <<: *gcc
-
-.gcc-riscv64-cross-build-debug:
-  extends: .riscv64-cross-build-debug
-  variables:
-    <<: *gcc
-
-.ppc64le-cross-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: ppc64
-  tags:
-    - x86_64
-
-.ppc64le-cross-build:
-  extends: .ppc64le-cross-build-tmpl
-  variables:
-    debug: n
-
-.ppc64le-cross-build-debug:
-  extends: .ppc64le-cross-build-tmpl
-  variables:
-    debug: y
-
-.gcc-ppc64le-cross-build:
-  extends: .ppc64le-cross-build
-  variables:
-    <<: *gcc
-
-.gcc-ppc64le-cross-build-debug:
-  extends: .ppc64le-cross-build-debug
-  variables:
-    <<: *gcc
-
-.yocto-test:
-  stage: build
-  image: registry.gitlab.com/xen-project/xen/${CONTAINER}
-  script:
-    - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT}
-  variables:
-    YOCTO_VERSION: kirkstone
-    CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST}
-  artifacts:
-    paths:
-      - 'logs/*'
-      - binaries/
-    when: always
-  needs: []
-
-.yocto-test-arm64:
-  extends: .yocto-test
-  variables:
-    YOCTO_HOST: arm64v8
-  tags:
-    - arm64
+# .gcc-x86-64-build-debug:
+#   extends: .x86-64-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-x86-32-build:
+#   extends: .x86-32-build
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-x86-32-build-debug:
+#   extends: .x86-32-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .clang-x86-64-build:
+#   extends: .x86-64-build
+#   variables:
+#     <<: *clang
+# 
+# .clang-x86-64-build-debug:
+#   extends: .x86-64-build-debug
+#   variables:
+#     <<: *clang
+# 
+# .clang-x86-32-build:
+#   extends: .x86-32-build
+#   variables:
+#     <<: *clang
+# 
+# .clang-x86-32-build-debug:
+#   extends: .x86-32-build-debug
+#   variables:
+#     <<: *clang
+# 
+# .arm32-cross-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: arm32
+#   tags:
+#     - arm64
+# 
+# .arm32-cross-build:
+#   extends: .arm32-cross-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .arm32-cross-build-debug:
+#   extends: .arm32-cross-build-tmpl
+#   variables:
+#     debug: y
+# 
+# .gcc-arm32-cross-build:
+#   extends: .arm32-cross-build
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-arm32-cross-build-debug:
+#   extends: .arm32-cross-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .arm64-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: arm64
+#   tags:
+#     - arm64
+# 
+# .arm64-build:
+#   extends: .arm64-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .arm64-build-debug:
+#   extends: .arm64-build-tmpl
+#   variables:
+#     debug: y
+# 
+# .gcc-arm64-build:
+#   extends: .arm64-build
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-arm64-build-debug:
+#   extends: .arm64-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .riscv64-cross-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: riscv64
+#   tags:
+#     - x86_64
+# 
+# .riscv64-cross-build:
+#   extends: .riscv64-cross-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .riscv64-cross-build-debug:
+#   extends: .riscv64-cross-build-tmpl
+#   variables:
+#     debug: y
+# 
+# .gcc-riscv64-cross-build:
+#   extends: .riscv64-cross-build
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-riscv64-cross-build-debug:
+#   extends: .riscv64-cross-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .ppc64le-cross-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: ppc64
+#   tags:
+#     - x86_64
+# 
+# .ppc64le-cross-build:
+#   extends: .ppc64le-cross-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .ppc64le-cross-build-debug:
+#   extends: .ppc64le-cross-build-tmpl
+#   variables:
+#     debug: y
+# 
+# .gcc-ppc64le-cross-build:
+#   extends: .ppc64le-cross-build
+#   variables:
+#     <<: *gcc
+# 
+# .gcc-ppc64le-cross-build-debug:
+#   extends: .ppc64le-cross-build-debug
+#   variables:
+#     <<: *gcc
+# 
+# .yocto-test:
+#   stage: build
+#   image: registry.gitlab.com/xen-project/xen/${CONTAINER}
+#   script:
+#     - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT}
+#   variables:
+#     YOCTO_VERSION: kirkstone
+#     CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST}
+#   artifacts:
+#     paths:
+#       - 'logs/*'
+#       - binaries/
+#     when: always
+#   needs: []
+# 
+# .yocto-test-arm64:
+#   extends: .yocto-test
+#   variables:
+#     YOCTO_HOST: arm64v8
+#   tags:
+#     - arm64
 
 # This is not used by any test job as we only run Yocto on arm based machines.
 # Keep it here so that someone having x86 hardware can easily add jobs.
-.yocto-test-x86-64:
-  extends: .yocto-test
-  variables:
-    YOCTO_HOST: amd64
-  tags:
-    - x86_64
-
-.x86-64-cross-build-tmpl:
-  <<: *build
-  variables:
-    XEN_TARGET_ARCH: x86_64
-  tags:
-    - arm64
-
-.x86-64-cross-build:
-  extends: .x86-64-cross-build-tmpl
-  variables:
-    debug: n
-
-.gcc-x86-64-cross-build:
-  extends: .x86-64-cross-build
-  variables:
-    <<: *gcc
+# .yocto-test-x86-64:
+#   extends: .yocto-test
+#   variables:
+#     YOCTO_HOST: amd64
+#   tags:
+#     - x86_64
+# 
+# .x86-64-cross-build-tmpl:
+#   <<: *build
+#   variables:
+#     XEN_TARGET_ARCH: x86_64
+#   tags:
+#     - arm64
+# 
+# .x86-64-cross-build:
+#   extends: .x86-64-cross-build-tmpl
+#   variables:
+#     debug: n
+# 
+# .gcc-x86-64-cross-build:
+#   extends: .x86-64-cross-build
+#   variables:
+#     <<: *gcc
 
 ## Test artifacts common
 
@@ -262,63 +262,63 @@
 
 # Arm test artifacts
 
-alpine-3.18-arm64-rootfs-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8
-  script:
-    - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz
-  artifacts:
-    paths:
-      - binaries/initrd.tar.gz
-  tags:
-    - arm64
-
-kernel-5.19-arm64-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8
-  script:
-    - mkdir binaries && cp /Image binaries/Image
-  artifacts:
-    paths:
-      - binaries/Image
-  tags:
-    - arm64
-
-qemu-system-aarch64-6.0.0-arm64-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
-  script:
-    - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64
-  artifacts:
-    paths:
-      - binaries/qemu-system-aarch64
-  tags:
-    - arm64
-
-qemu-system-aarch64-6.0.0-arm32-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
-  script:
-    - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm
-  artifacts:
-    paths:
-      - binaries/qemu-system-arm
-  tags:
-    - arm64
-
-# ppc64 test artifacts
-
-qemu-system-ppc64-8.1.0-ppc64-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-ppc64:8.1.0-ppc64
-  script:
-    - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/
-  artifacts:
-    paths:
-      - binaries/qemu-system-ppc64
-      - binaries/skiboot.lid
-  tags:
-    - x86_64
+# alpine-3.18-arm64-rootfs-export:
+#   extends: .test-jobs-artifact-common
+#   image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8
+#   script:
+#     - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz
+#   artifacts:
+#     paths:
+#       - binaries/initrd.tar.gz
+#   tags:
+#     - arm64
+# 
+# kernel-5.19-arm64-export:
+#   extends: .test-jobs-artifact-common
+#   image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8
+#   script:
+#     - mkdir binaries && cp /Image binaries/Image
+#   artifacts:
+#     paths:
+#       - binaries/Image
+#   tags:
+#     - arm64
+# 
+# qemu-system-aarch64-6.0.0-arm64-export:
+#   extends: .test-jobs-artifact-common
+#   image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
+#   script:
+#     - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64
+#   artifacts:
+#     paths:
+#       - binaries/qemu-system-aarch64
+#   tags:
+#     - arm64
+# 
+# qemu-system-aarch64-6.0.0-arm32-export:
+#   extends: .test-jobs-artifact-common
+#   image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
+#   script:
+#     - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm
+#   artifacts:
+#     paths:
+#       - binaries/qemu-system-arm
+#   tags:
+#     - arm64
+# 
+# # ppc64 test artifacts
+# 
+# qemu-system-ppc64-8.1.0-ppc64-export:
+#   extends: .test-jobs-artifact-common
+#   image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-ppc64:8.1.0-ppc64
+#   script:
+#     - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/
+#   artifacts:
+#     paths:
+#       - binaries/qemu-system-ppc64
+#       - binaries/skiboot.lid
+#   tags:
+#     - x86_64
 
 # x86_64 test artifacts
 
@@ -348,15 +348,15 @@ kernel-6.1.19-export:
 
 # Build jobs needed for tests
 
-alpine-3.18-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: alpine:3.18
-
-alpine-3.18-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: alpine:3.18
+# alpine-3.18-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: alpine:3.18
+# 
+# alpine-3.18-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18
 
 alpine-3.18-gcc-livepatch:
   extends: .gcc-x86-64-build
@@ -366,477 +366,477 @@ alpine-3.18-gcc-livepatch:
     EXTRA_XEN_CONFIG: |
       CONFIG_LIVEPATCH=y
 
-debian-stretch-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: debian:stretch
-
-debian-bookworm-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: debian:bookworm
-
-# Arm32 cross-build
-
-debian-bookworm-gcc-arm32:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-
-debian-bookworm-gcc-arm32-debug:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-
-debian-bookworm-gcc-arm32-randconfig:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    RANDCONFIG: y
-
-debian-bookworm-gcc-arm32-debug-randconfig:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    RANDCONFIG: y
-
-debian-bookworm-gcc-arm32-staticmem:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-debian-bookworm-gcc-arm32-debug-staticmem:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:bookworm-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-# Arm builds
-
-debian-bookworm-gcc-arm64:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-
-debian-bookworm-gcc-debug-arm64:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-
-debian-bookworm-gcc-arm64-randconfig:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-    RANDCONFIG: y
-
-debian-bookworm-gcc-debug-arm64-randconfig:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-    RANDCONFIG: y
-
-alpine-3.18-gcc-arm64:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-
-alpine-3.18-gcc-debug-arm64:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-
-alpine-3.18-gcc-arm64-randconfig:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    RANDCONFIG: y
-
-alpine-3.18-gcc-debug-arm64-randconfig:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    RANDCONFIG: y
-
-alpine-3.18-gcc-arm64-staticmem:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-alpine-3.18-gcc-debug-arm64-staticmem:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-alpine-3.18-gcc-arm64-static-shared-mem:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-      CONFIG_STATIC_SHM=y
-
-alpine-3.18-gcc-debug-arm64-static-shared-mem:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-      CONFIG_STATIC_SHM=y
-
-alpine-3.18-gcc-arm64-boot-cpupools:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_SCHED_NULL=y
-      CONFIG_BOOT_TIME_CPUPOOLS=y
-
-alpine-3.18-gcc-debug-arm64-boot-cpupools:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.18-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_BOOT_TIME_CPUPOOLS=y
-
-# RISC-V 64 cross-build
-archlinux-current-gcc-riscv64:
-  extends: .gcc-riscv64-cross-build
-  variables:
-    CONTAINER: archlinux:current-riscv64
-    KBUILD_DEFCONFIG: tiny64_defconfig
-    HYPERVISOR_ONLY: y
-
-archlinux-current-gcc-riscv64-debug:
-  extends: .gcc-riscv64-cross-build-debug
-  variables:
-    CONTAINER: archlinux:current-riscv64
-    KBUILD_DEFCONFIG: tiny64_defconfig
-    HYPERVISOR_ONLY: y
-
-archlinux-current-gcc-riscv64-randconfig:
-  extends: .gcc-riscv64-cross-build
-  variables:
-    CONTAINER: archlinux:current-riscv64
-    KBUILD_DEFCONFIG: tiny64_defconfig
-    RANDCONFIG: y
-    EXTRA_FIXED_RANDCONFIG:
-      CONFIG_COVERAGE=n
-
-archlinux-current-gcc-riscv64-debug-randconfig:
-  extends: .gcc-riscv64-cross-build-debug
-  variables:
-    CONTAINER: archlinux:current-riscv64
-    KBUILD_DEFCONFIG: tiny64_defconfig
-    RANDCONFIG: y
-    EXTRA_FIXED_RANDCONFIG:
-      CONFIG_COVERAGE=n
-
-# Power cross-build
-debian-bullseye-gcc-ppc64le:
-  extends: .gcc-ppc64le-cross-build
-  variables:
-    CONTAINER: debian:bullseye-ppc64le
-    KBUILD_DEFCONFIG: ppc64_defconfig
-    HYPERVISOR_ONLY: y
-
-debian-bullseye-gcc-ppc64le-debug:
-  extends: .gcc-ppc64le-cross-build-debug
-  variables:
-    CONTAINER: debian:bullseye-ppc64le
-    KBUILD_DEFCONFIG: ppc64_defconfig
-    HYPERVISOR_ONLY: y
-
-# Yocto test jobs
-yocto-qemuarm64:
-  extends: .yocto-test-arm64
-  variables:
-    YOCTO_BOARD: qemuarm64
-
-yocto-qemuarm:
-  extends: .yocto-test-arm64
-  variables:
-    YOCTO_BOARD: qemuarm
-    YOCTO_OUTPUT: --copy-output
-
-yocto-qemux86-64:
-  extends: .yocto-test-arm64
-  variables:
-    YOCTO_BOARD: qemux86-64
-
-# Cppcheck analysis jobs
-
-debian-bookworm-gcc-cppcheck:
-  extends: .gcc-x86-64-cross-build
-  variables:
-    CONTAINER: debian:bookworm-cppcheck
-    CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-debian-bookworm-gcc-arm32-cppcheck:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:bookworm-cppcheck
-    CROSS_COMPILE: /usr/bin/arm-linux-gnueabihf-
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-debian-bookworm-gcc-arm64-cppcheck:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:bookworm-cppcheck
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-# Build jobs not needed for tests
-
-alpine-3.18-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: alpine:3.18
-
-alpine-3.18-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: alpine:3.18
-
-archlinux-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: archlinux:current
-
-archlinux-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: archlinux:current
-
-centos-7-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: centos:7
-
-centos-7-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: centos:7
-
-debian-stretch-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:stretch
-
-debian-stretch-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: debian:stretch
-
-debian-stretch-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: debian:stretch
-
-debian-stretch-32-clang-debug:
-  extends: .clang-x86-32-build-debug
-  variables:
-    CONTAINER: debian:stretch-i386
-
-debian-stretch-32-gcc-debug:
-  extends: .gcc-x86-32-build-debug
-  variables:
-    CONTAINER: debian:stretch-i386
-
-debian-buster-gcc-ibt:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:buster-gcc-ibt
-    RANDCONFIG: y
-    EXTRA_FIXED_RANDCONFIG: |
-      CONFIG_XEN_IBT=y
-
-debian-bookworm-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: debian:bookworm
-
-debian-bookworm-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:bookworm
-
-debian-bookworm-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: debian:bookworm
-
-debian-bookworm-gcc-randconfig:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:bookworm
-    RANDCONFIG: y
-
-debian-bookworm-gcc-debug-randconfig:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: debian:bookworm
-    RANDCONFIG: y
-
-debian-bookworm-32-clang-debug:
-  extends: .clang-x86-32-build-debug
-  variables:
-    CONTAINER: debian:bookworm-i386
-
-debian-bookworm-32-gcc-debug:
-  extends: .gcc-x86-32-build-debug
-  variables:
-    CONTAINER: debian:bookworm-i386
-
-fedora-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: fedora:29
-
-fedora-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: fedora:29
-
-# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5
-
-ubuntu-trusty-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: ubuntu:trusty
-
-ubuntu-trusty-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:trusty
-
-ubuntu-xenial-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: ubuntu:xenial
-
-ubuntu-xenial-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:xenial
-
-ubuntu-xenial-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: ubuntu:xenial
-
-ubuntu-xenial-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:xenial
-
-ubuntu-bionic-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: ubuntu:bionic
-
-ubuntu-bionic-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:bionic
-
-ubuntu-bionic-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: ubuntu:bionic
-
-ubuntu-bionic-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:bionic
-
-ubuntu-focal-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: ubuntu:focal
-
-ubuntu-focal-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:focal
-
-ubuntu-focal-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: ubuntu:focal
-
-ubuntu-focal-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: ubuntu:focal
-
-opensuse-leap-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: suse:opensuse-leap
-
-opensuse-leap-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: suse:opensuse-leap
-
-opensuse-leap-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: suse:opensuse-leap
-
-opensuse-leap-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: suse:opensuse-leap
-
-opensuse-tumbleweed-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: suse:opensuse-tumbleweed
-  allow_failure: true
-
-opensuse-tumbleweed-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: suse:opensuse-tumbleweed
-  allow_failure: true
-
-opensuse-tumbleweed-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: suse:opensuse-tumbleweed
-  allow_failure: true
-
-opensuse-tumbleweed-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: suse:opensuse-tumbleweed
-  allow_failure: true
+# debian-stretch-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: debian:stretch
+# 
+# debian-bookworm-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm
+# 
+# # Arm32 cross-build
+# 
+# debian-bookworm-gcc-arm32:
+#   extends: .gcc-arm32-cross-build
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+# 
+# debian-bookworm-gcc-arm32-debug:
+#   extends: .gcc-arm32-cross-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+# 
+# debian-bookworm-gcc-arm32-randconfig:
+#   extends: .gcc-arm32-cross-build
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+#     RANDCONFIG: y
+# 
+# debian-bookworm-gcc-arm32-debug-randconfig:
+#   extends: .gcc-arm32-cross-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+#     RANDCONFIG: y
+# 
+# debian-bookworm-gcc-arm32-staticmem:
+#   extends: .gcc-arm32-cross-build
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_EXPERT=y
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+# 
+# debian-bookworm-gcc-arm32-debug-staticmem:
+#   extends: .gcc-arm32-cross-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8-arm32-gcc
+#     HYPERVISOR_ONLY: y
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_EXPERT=y
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+# 
+# # Arm builds
+# 
+# debian-bookworm-gcc-arm64:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+# 
+# debian-bookworm-gcc-debug-arm64:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+# 
+# debian-bookworm-gcc-arm64-randconfig:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+#     RANDCONFIG: y
+# 
+# debian-bookworm-gcc-debug-arm64-randconfig:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+#     RANDCONFIG: y
+# 
+# alpine-3.18-gcc-arm64:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+# 
+# alpine-3.18-gcc-debug-arm64:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+# 
+# alpine-3.18-gcc-arm64-randconfig:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     RANDCONFIG: y
+# 
+# alpine-3.18-gcc-debug-arm64-randconfig:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     RANDCONFIG: y
+# 
+# alpine-3.18-gcc-arm64-staticmem:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_EXPERT=y
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+# 
+# alpine-3.18-gcc-debug-arm64-staticmem:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_EXPERT=y
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+# 
+# alpine-3.18-gcc-arm64-static-shared-mem:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+#       CONFIG_STATIC_SHM=y
+# 
+# alpine-3.18-gcc-debug-arm64-static-shared-mem:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_STATIC_MEMORY=y
+#       CONFIG_STATIC_SHM=y
+# 
+# alpine-3.18-gcc-arm64-boot-cpupools:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_EXPERT=y
+#       CONFIG_UNSUPPORTED=y
+#       CONFIG_SCHED_NULL=y
+#       CONFIG_BOOT_TIME_CPUPOOLS=y
+# 
+# alpine-3.18-gcc-debug-arm64-boot-cpupools:
+#   extends: .gcc-arm64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18-arm64v8
+#     EXTRA_XEN_CONFIG: |
+#       CONFIG_BOOT_TIME_CPUPOOLS=y
+# 
+# # RISC-V 64 cross-build
+# archlinux-current-gcc-riscv64:
+#   extends: .gcc-riscv64-cross-build
+#   variables:
+#     CONTAINER: archlinux:current-riscv64
+#     KBUILD_DEFCONFIG: tiny64_defconfig
+#     HYPERVISOR_ONLY: y
+# 
+# archlinux-current-gcc-riscv64-debug:
+#   extends: .gcc-riscv64-cross-build-debug
+#   variables:
+#     CONTAINER: archlinux:current-riscv64
+#     KBUILD_DEFCONFIG: tiny64_defconfig
+#     HYPERVISOR_ONLY: y
+# 
+# archlinux-current-gcc-riscv64-randconfig:
+#   extends: .gcc-riscv64-cross-build
+#   variables:
+#     CONTAINER: archlinux:current-riscv64
+#     KBUILD_DEFCONFIG: tiny64_defconfig
+#     RANDCONFIG: y
+#     EXTRA_FIXED_RANDCONFIG:
+#       CONFIG_COVERAGE=n
+# 
+# archlinux-current-gcc-riscv64-debug-randconfig:
+#   extends: .gcc-riscv64-cross-build-debug
+#   variables:
+#     CONTAINER: archlinux:current-riscv64
+#     KBUILD_DEFCONFIG: tiny64_defconfig
+#     RANDCONFIG: y
+#     EXTRA_FIXED_RANDCONFIG:
+#       CONFIG_COVERAGE=n
+# 
+# # Power cross-build
+# debian-bullseye-gcc-ppc64le:
+#   extends: .gcc-ppc64le-cross-build
+#   variables:
+#     CONTAINER: debian:bullseye-ppc64le
+#     KBUILD_DEFCONFIG: ppc64_defconfig
+#     HYPERVISOR_ONLY: y
+# 
+# debian-bullseye-gcc-ppc64le-debug:
+#   extends: .gcc-ppc64le-cross-build-debug
+#   variables:
+#     CONTAINER: debian:bullseye-ppc64le
+#     KBUILD_DEFCONFIG: ppc64_defconfig
+#     HYPERVISOR_ONLY: y
+# 
+# # Yocto test jobs
+# yocto-qemuarm64:
+#   extends: .yocto-test-arm64
+#   variables:
+#     YOCTO_BOARD: qemuarm64
+# 
+# yocto-qemuarm:
+#   extends: .yocto-test-arm64
+#   variables:
+#     YOCTO_BOARD: qemuarm
+#     YOCTO_OUTPUT: --copy-output
+# 
+# yocto-qemux86-64:
+#   extends: .yocto-test-arm64
+#   variables:
+#     YOCTO_BOARD: qemux86-64
+# 
+# # Cppcheck analysis jobs
+# 
+# debian-bookworm-gcc-cppcheck:
+#   extends: .gcc-x86-64-cross-build
+#   variables:
+#     CONTAINER: debian:bookworm-cppcheck
+#     CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
+#     CPPCHECK: y
+#     HYPERVISOR_ONLY: y
+# 
+# debian-bookworm-gcc-arm32-cppcheck:
+#   extends: .gcc-arm32-cross-build
+#   variables:
+#     CONTAINER: debian:bookworm-cppcheck
+#     CROSS_COMPILE: /usr/bin/arm-linux-gnueabihf-
+#     CPPCHECK: y
+#     HYPERVISOR_ONLY: y
+# 
+# debian-bookworm-gcc-arm64-cppcheck:
+#   extends: .gcc-arm64-build
+#   variables:
+#     CONTAINER: debian:bookworm-cppcheck
+#     CPPCHECK: y
+#     HYPERVISOR_ONLY: y
+# 
+# # Build jobs not needed for tests
+# 
+# alpine-3.18-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: alpine:3.18
+# 
+# alpine-3.18-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: alpine:3.18
+# 
+# archlinux-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: archlinux:current
+# 
+# archlinux-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: archlinux:current
+# 
+# centos-7-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: centos:7
+# 
+# centos-7-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: centos:7
+# 
+# debian-stretch-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: debian:stretch
+# 
+# debian-stretch-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: debian:stretch
+# 
+# debian-stretch-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: debian:stretch
+# 
+# debian-stretch-32-clang-debug:
+#   extends: .clang-x86-32-build-debug
+#   variables:
+#     CONTAINER: debian:stretch-i386
+# 
+# debian-stretch-32-gcc-debug:
+#   extends: .gcc-x86-32-build-debug
+#   variables:
+#     CONTAINER: debian:stretch-i386
+# 
+# debian-buster-gcc-ibt:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: debian:buster-gcc-ibt
+#     RANDCONFIG: y
+#     EXTRA_FIXED_RANDCONFIG: |
+#       CONFIG_XEN_IBT=y
+# 
+# debian-bookworm-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: debian:bookworm
+# 
+# debian-bookworm-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: debian:bookworm
+# 
+# debian-bookworm-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm
+# 
+# debian-bookworm-gcc-randconfig:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: debian:bookworm
+#     RANDCONFIG: y
+# 
+# debian-bookworm-gcc-debug-randconfig:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm
+#     RANDCONFIG: y
+# 
+# debian-bookworm-32-clang-debug:
+#   extends: .clang-x86-32-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-i386
+# 
+# debian-bookworm-32-gcc-debug:
+#   extends: .gcc-x86-32-build-debug
+#   variables:
+#     CONTAINER: debian:bookworm-i386
+# 
+# fedora-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: fedora:29
+# 
+# fedora-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: fedora:29
+# 
+# # Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5
+# 
+# ubuntu-trusty-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:trusty
+# 
+# ubuntu-trusty-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:trusty
+# 
+# ubuntu-xenial-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:xenial
+# 
+# ubuntu-xenial-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:xenial
+# 
+# ubuntu-xenial-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:xenial
+# 
+# ubuntu-xenial-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:xenial
+# 
+# ubuntu-bionic-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:bionic
+# 
+# ubuntu-bionic-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:bionic
+# 
+# ubuntu-bionic-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:bionic
+# 
+# ubuntu-bionic-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:bionic
+# 
+# ubuntu-focal-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:focal
+# 
+# ubuntu-focal-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:focal
+# 
+# ubuntu-focal-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: ubuntu:focal
+# 
+# ubuntu-focal-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: ubuntu:focal
+# 
+# opensuse-leap-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: suse:opensuse-leap
+# 
+# opensuse-leap-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: suse:opensuse-leap
+# 
+# opensuse-leap-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: suse:opensuse-leap
+# 
+# opensuse-leap-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: suse:opensuse-leap
+# 
+# opensuse-tumbleweed-clang:
+#   extends: .clang-x86-64-build
+#   variables:
+#     CONTAINER: suse:opensuse-tumbleweed
+#   allow_failure: true
+# 
+# opensuse-tumbleweed-clang-debug:
+#   extends: .clang-x86-64-build-debug
+#   variables:
+#     CONTAINER: suse:opensuse-tumbleweed
+#   allow_failure: true
+# 
+# opensuse-tumbleweed-gcc:
+#   extends: .gcc-x86-64-build
+#   variables:
+#     CONTAINER: suse:opensuse-tumbleweed
+#   allow_failure: true
+# 
+# opensuse-tumbleweed-gcc-debug:
+#   extends: .gcc-x86-64-build-debug
+#   variables:
+#     CONTAINER: suse:opensuse-tumbleweed
+#   allow_failure: true
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index c70975a2eb..362fe30ad7 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -2,43 +2,43 @@
   stage: test
   image: registry.gitlab.com/royger/xen/${CONTAINER}
 
-.arm64-test-needs: &arm64-test-needs
-  - alpine-3.18-arm64-rootfs-export
-  - kernel-5.19-arm64-export
-  - qemu-system-aarch64-6.0.0-arm64-export
-
-.arm32-test-needs: &arm32-test-needs
-  - qemu-system-aarch64-6.0.0-arm32-export
+# .arm64-test-needs: &arm64-test-needs
+#   - alpine-3.18-arm64-rootfs-export
+#   - kernel-5.19-arm64-export
+#   - qemu-system-aarch64-6.0.0-arm64-export
+# 
+# .arm32-test-needs: &arm32-test-needs
+#   - qemu-system-aarch64-6.0.0-arm32-export
 
 .x86-64-test-needs: &x86-64-test-needs
   - alpine-3.18-rootfs-export
   - kernel-6.1.19-export
 
-.qemu-arm64:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-    LOGFILE: qemu-smoke-arm64.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  tags:
-    - arm64
-
-.qemu-arm32:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: debian:bookworm-arm64v8
-    LOGFILE: qemu-smoke-arm32.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  tags:
-    - arm64
+# .qemu-arm64:
+#   extends: .test-jobs-common
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+#     LOGFILE: qemu-smoke-arm64.log
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#     when: always
+#   tags:
+#     - arm64
+#
+# .qemu-arm32:
+#   extends: .test-jobs-common
+#   variables:
+#     CONTAINER: debian:bookworm-arm64v8
+#     LOGFILE: qemu-smoke-arm32.log
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#     when: always
+#   tags:
+#     - arm64
 
 .qemu-x86-64:
   extends: .test-jobs-common
@@ -53,412 +53,412 @@
   tags:
     - x86_64
 
-.qemu-riscv64:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: archlinux:current-riscv64
-    LOGFILE: qemu-smoke-riscv64.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  tags:
-    - x86_64
-
-.qemu-ppc64le:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: debian:bullseye-ppc64le
-    LOGFILE: qemu-smoke-ppc64le.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  tags:
-    - x86_64
-
-.xilinx-arm64:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: ubuntu:xenial-xilinx
-    LOGFILE: qemu-smoke-xilinx.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-      - '*.dtb'
-    when: always
-  only:
-    variables:
-      - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
-  tags:
-    - xilinx
-
-.adl-x86-64:
-  extends: .test-jobs-common
-  variables:
-    # the test controller runs on RPi4
-    CONTAINER: alpine:3.18-arm64v8
-    LOGFILE: smoke-test.log
-    PCIDEV: "03:00.0"
-    PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1"
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  only:
-    variables:
-      - $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
-  tags:
-    - qubes-hw2
-
-.zen3p-x86-64:
-  # it's really similar to the above
-  extends: .adl-x86-64
-  variables:
-    PCIDEV: "01:00.0"
-    PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
-  tags:
-    - qubes-hw11
+# .qemu-riscv64:
+#   extends: .test-jobs-common
+#   variables:
+#     CONTAINER: archlinux:current-riscv64
+#     LOGFILE: qemu-smoke-riscv64.log
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#     when: always
+#   tags:
+#     - x86_64
+# 
+# .qemu-ppc64le:
+#   extends: .test-jobs-common
+#   variables:
+#     CONTAINER: debian:bullseye-ppc64le
+#     LOGFILE: qemu-smoke-ppc64le.log
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#     when: always
+#   tags:
+#     - x86_64
+# 
+# .xilinx-arm64:
+#   extends: .test-jobs-common
+#   variables:
+#     CONTAINER: ubuntu:xenial-xilinx
+#     LOGFILE: qemu-smoke-xilinx.log
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#       - '*.dtb'
+#     when: always
+#   only:
+#     variables:
+#       - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
+#   tags:
+#     - xilinx
+# 
+# .adl-x86-64:
+#   extends: .test-jobs-common
+#   variables:
+#     # the test controller runs on RPi4
+#     CONTAINER: alpine:3.18-arm64v8
+#     LOGFILE: smoke-test.log
+#     PCIDEV: "03:00.0"
+#     PCIDEV_INTR: "MSI-X"
+#     CONSOLE_OPTS: "console=com1 com1=115200,8n1"
+#   artifacts:
+#     paths:
+#       - smoke.serial
+#       - '*.log'
+#     when: always
+#   only:
+#     variables:
+#       - $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
+#   tags:
+#     - qubes-hw2
+# 
+# .zen3p-x86-64:
+#   # it's really similar to the above
+#   extends: .adl-x86-64
+#   variables:
+#     PCIDEV: "01:00.0"
+#     PCIDEV_INTR: "MSI-X"
+#     CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
+#   tags:
+#     - qubes-hw11
 
 # Test jobs
-build-each-commit-gcc:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: debian:stretch
-    XEN_TARGET_ARCH: x86_64
-    CC: gcc
-  script:
-    - BASE=${BASE_SHA:-${CI_COMMIT_BEFORE_SHA}} TIP=${TIP_SHA:-${CI_COMMIT_SHA}} ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log
-  after_script:
-    - mv ../build-each-commit-gcc.log .
-  artifacts:
-    paths:
-      - '*.log'
-    when: always
-  needs: []
-  tags:
-    - x86_64
-
-xilinx-smoke-dom0less-arm64-gcc:
-  extends: .xilinx-arm64
-  script:
-    - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64
-
-xilinx-smoke-dom0less-arm64-gcc-gem-passthrough:
-  extends: .xilinx-arm64
-  script:
-    - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64
-
-adl-smoke-x86-64-gcc-debug:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-adl-smoke-x86-64-dom0pvh-gcc-debug:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-adl-suspend-x86-64-gcc-debug:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-adl-pci-pv-x86-64-gcc-debug:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-adl-pci-hvm-x86-64-gcc-debug:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-zen3p-smoke-x86-64-gcc-debug:
-  extends: .zen3p-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-zen3p-smoke-x86-64-dom0pvh-gcc-debug:
-  extends: .zen3p-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-zen3p-pci-hvm-x86-64-gcc-debug:
-  extends: .zen3p-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc-debug
-
-qemu-smoke-dom0-arm64-gcc:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64
-
-qemu-smoke-dom0-arm64-gcc-debug:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-debug-arm64
-
-qemu-smoke-dom0less-arm64-gcc:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64
-
-qemu-smoke-dom0less-arm64-gcc-debug:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-debug-arm64
-
-qemu-smoke-dom0less-arm64-gcc-staticmem:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64-staticmem
-
-qemu-smoke-dom0less-arm64-gcc-debug-staticmem:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-debug-arm64-staticmem
-
-qemu-smoke-dom0less-arm64-gcc-staticheap:
- extends: .qemu-arm64
- script:
-   - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee ${LOGFILE}
- needs:
-   - *arm64-test-needs
-   - alpine-3.18-gcc-arm64
-
-qemu-smoke-dom0less-arm64-gcc-debug-staticheap:
- extends: .qemu-arm64
- script:
-   - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee ${LOGFILE}
- needs:
-   - *arm64-test-needs
-   - alpine-3.18-gcc-debug-arm64
-
-qemu-smoke-dom0less-arm64-gcc-static-shared-mem:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64-static-shared-mem
-
-qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-debug-arm64-static-shared-mem
-
-qemu-smoke-dom0less-arm64-gcc-boot-cpupools:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-arm64-boot-cpupools
-
-qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm64-test-needs
-    - alpine-3.18-gcc-debug-arm64-boot-cpupools
-
-qemu-xtf-dom0less-arm64-gcc-hyp-xen-version:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE}
-  needs:
-    - alpine-3.18-gcc-arm64
-    - qemu-system-aarch64-6.0.0-arm64-export
-
-qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version:
-  extends: .qemu-arm64
-  script:
-    - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE}
-  needs:
-    - alpine-3.18-gcc-debug-arm64
-    - qemu-system-aarch64-6.0.0-arm64-export
-
-qemu-smoke-dom0-arm32-gcc:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - yocto-qemuarm
-
-qemu-smoke-dom0less-arm32-gcc:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32
-
-qemu-smoke-dom0less-arm32-gcc-debug:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32-debug
-
-qemu-smoke-dom0less-arm32-gcc-staticmem:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32-staticmem
-
-qemu-smoke-dom0less-arm32-gcc-debug-staticmem:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32-debug-staticmem
-
-qemu-smoke-dom0less-arm32-gcc-gzip:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32
-
-qemu-smoke-dom0less-arm32-gcc-debug-gzip:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32-debug
-
-qemu-smoke-dom0less-arm32-gcc-without-dom0:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32
-
-qemu-smoke-dom0less-arm32-gcc-debug-without-dom0:
-  extends: .qemu-arm32
-  script:
-    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
-  needs:
-    - *arm32-test-needs
-    - debian-bookworm-gcc-arm32-debug
-
-qemu-alpine-x86_64-gcc:
-  extends: .qemu-x86-64
-  script:
-    - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.18-gcc
-
-qemu-smoke-x86-64-gcc:
-  extends: .qemu-x86-64
-  script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
-  needs:
-    - debian-stretch-gcc-debug
-
-qemu-smoke-x86-64-clang:
-  extends: .qemu-x86-64
-  script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
-  needs:
-    - debian-bookworm-clang-debug
-
-qemu-smoke-x86-64-gcc-pvh:
-  extends: .qemu-x86-64
-  script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
-  needs:
-    - debian-stretch-gcc-debug
-
-qemu-smoke-x86-64-clang-pvh:
-  extends: .qemu-x86-64
-  script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
-  needs:
-    - debian-bookworm-clang-debug
-
-qemu-smoke-riscv64-gcc:
-  extends: .qemu-riscv64
-  script:
-    - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - archlinux-current-gcc-riscv64-debug
-
-qemu-smoke-ppc64le-powernv9-gcc:
-  extends: .qemu-ppc64le
-  script:
-    - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE}
-  needs:
-    - qemu-system-ppc64-8.1.0-ppc64-export
-    - debian-bullseye-gcc-ppc64le-debug
+#build-each-commit-gcc:
+#  extends: .test-jobs-common
+#  variables:
+#    CONTAINER: debian:stretch
+#    XEN_TARGET_ARCH: x86_64
+#    CC: gcc
+#  script:
+#    - BASE=${BASE_SHA:-${CI_COMMIT_BEFORE_SHA}} TIP=${TIP_SHA:-${CI_COMMIT_SHA}} ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log
+#  after_script:
+#    - mv ../build-each-commit-gcc.log .
+#  artifacts:
+#    paths:
+#      - '*.log'
+#    when: always
+#  needs: []
+#  tags:
+#    - x86_64
+#
+#xilinx-smoke-dom0less-arm64-gcc:
+#  extends: .xilinx-arm64
+#  script:
+#    - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64
+#
+#xilinx-smoke-dom0less-arm64-gcc-gem-passthrough:
+#  extends: .xilinx-arm64
+#  script:
+#    - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64
+#
+#adl-smoke-x86-64-gcc-debug:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#adl-smoke-x86-64-dom0pvh-gcc-debug:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#adl-suspend-x86-64-gcc-debug:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#adl-pci-pv-x86-64-gcc-debug:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#adl-pci-hvm-x86-64-gcc-debug:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#zen3p-smoke-x86-64-gcc-debug:
+#  extends: .zen3p-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#zen3p-smoke-x86-64-dom0pvh-gcc-debug:
+#  extends: .zen3p-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#zen3p-pci-hvm-x86-64-gcc-debug:
+#  extends: .zen3p-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc-debug
+#
+#qemu-smoke-dom0-arm64-gcc:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64
+#
+#qemu-smoke-dom0-arm64-gcc-debug:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-debug-arm64
+#
+#qemu-smoke-dom0less-arm64-gcc:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64
+#
+#qemu-smoke-dom0less-arm64-gcc-debug:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-debug-arm64
+#
+#qemu-smoke-dom0less-arm64-gcc-staticmem:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64-staticmem
+#
+#qemu-smoke-dom0less-arm64-gcc-debug-staticmem:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-debug-arm64-staticmem
+#
+#qemu-smoke-dom0less-arm64-gcc-staticheap:
+# extends: .qemu-arm64
+# script:
+#   - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee ${LOGFILE}
+# needs:
+#   - *arm64-test-needs
+#   - alpine-3.18-gcc-arm64
+#
+#qemu-smoke-dom0less-arm64-gcc-debug-staticheap:
+# extends: .qemu-arm64
+# script:
+#   - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee ${LOGFILE}
+# needs:
+#   - *arm64-test-needs
+#   - alpine-3.18-gcc-debug-arm64
+#
+#qemu-smoke-dom0less-arm64-gcc-static-shared-mem:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64-static-shared-mem
+#
+#qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-debug-arm64-static-shared-mem
+#
+#qemu-smoke-dom0less-arm64-gcc-boot-cpupools:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-arm64-boot-cpupools
+#
+#qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm64-test-needs
+#    - alpine-3.18-gcc-debug-arm64-boot-cpupools
+#
+#qemu-xtf-dom0less-arm64-gcc-hyp-xen-version:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - alpine-3.18-gcc-arm64
+#    - qemu-system-aarch64-6.0.0-arm64-export
+#
+#qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version:
+#  extends: .qemu-arm64
+#  script:
+#    - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - alpine-3.18-gcc-debug-arm64
+#    - qemu-system-aarch64-6.0.0-arm64-export
+#
+#qemu-smoke-dom0-arm32-gcc:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - yocto-qemuarm
+#
+#qemu-smoke-dom0less-arm32-gcc:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32
+#
+#qemu-smoke-dom0less-arm32-gcc-debug:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32-debug
+#
+#qemu-smoke-dom0less-arm32-gcc-staticmem:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32-staticmem
+#
+#qemu-smoke-dom0less-arm32-gcc-debug-staticmem:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32-debug-staticmem
+#
+#qemu-smoke-dom0less-arm32-gcc-gzip:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32
+#
+#qemu-smoke-dom0less-arm32-gcc-debug-gzip:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32-debug
+#
+#qemu-smoke-dom0less-arm32-gcc-without-dom0:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32
+#
+#qemu-smoke-dom0less-arm32-gcc-debug-without-dom0:
+#  extends: .qemu-arm32
+#  script:
+#    - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *arm32-test-needs
+#    - debian-bookworm-gcc-arm32-debug
+#
+#qemu-alpine-x86_64-gcc:
+#  extends: .qemu-x86-64
+#  script:
+#    - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.18-gcc
+#
+#qemu-smoke-x86-64-gcc:
+#  extends: .qemu-x86-64
+#  script:
+#    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - debian-stretch-gcc-debug
+#
+#qemu-smoke-x86-64-clang:
+#  extends: .qemu-x86-64
+#  script:
+#    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - debian-bookworm-clang-debug
+#
+#qemu-smoke-x86-64-gcc-pvh:
+#  extends: .qemu-x86-64
+#  script:
+#    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - debian-stretch-gcc-debug
+#
+#qemu-smoke-x86-64-clang-pvh:
+#  extends: .qemu-x86-64
+#  script:
+#    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - debian-bookworm-clang-debug
+#
+#qemu-smoke-riscv64-gcc:
+#  extends: .qemu-riscv64
+#  script:
+#    - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - archlinux-current-gcc-riscv64-debug
+#
+#qemu-smoke-ppc64le-powernv9-gcc:
+#  extends: .qemu-ppc64le
+#  script:
+#    - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - qemu-system-ppc64-8.1.0-ppc64-export
+#    - debian-bullseye-gcc-ppc64le-debug
 
 qemu-alpine-x86_64-gcc-livepatch:
   extends: .qemu-x86-64
diff --git a/automation/scripts/build b/automation/scripts/build
index f63e32d286..cde64e41f8 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -109,7 +109,7 @@ if [[ "$LIVEPATCH" == "y" ]]; then
 
     BUILDID=$(readelf -Wn xen/xen-syms | sed -n -e 's/^.*Build ID: //p')
 
-    git clone https://xenbits.xen.org/git-http/livepatch-build-tools.git
+    git clone https://gitlab.com/royger/livepatch-build-tools.git
     cd livepatch-build-tools
     make
     ./livepatch-build -s ../ -p ../xen/test/livepatch/test.patch -o out \
diff --git a/automation/scripts/qemu-alpine-x86_64-livepatch.sh b/automation/scripts/qemu-alpine-x86_64-livepatch.sh
index 2436da79ed..b1a8a550ef 100755
--- a/automation/scripts/qemu-alpine-x86_64-livepatch.sh
+++ b/automation/scripts/qemu-alpine-x86_64-livepatch.sh
@@ -54,7 +54,7 @@ EOF
 # Run the test
 rm -f smoke.serial
 set +e
-timeout -k 1 720 \
+timeout -k 1 1440 \
 qemu-system-x86_64 \
     -cpu qemu64,+svm \
     -m 2G -smp 2 \