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%2Flivepatch-test-12;p=people%2Froyger%2Fxen.git

---

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 02b804a623..33304e1b48 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -238,237 +238,237 @@
 
 # Jobs below this line
 
-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-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-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:stretch
-
-debian-stretch-gcc-debug:
-  extends: .gcc-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-unstable-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: debian:unstable
-
-debian-unstable-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: debian:unstable
-
-debian-unstable-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:unstable
-
-debian-unstable-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: debian:unstable
-
-debian-unstable-gcc-randconfig:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: debian:unstable
-    RANDCONFIG: y
-
-debian-unstable-gcc-debug-randconfig:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: debian:unstable
-    RANDCONFIG: y
-
-debian-unstable-32-clang-debug:
-  extends: .clang-x86-32-build-debug
-  variables:
-    CONTAINER: debian:unstable-i386
-
-debian-unstable-32-gcc-debug:
-  extends: .gcc-x86-32-build-debug
-  variables:
-    CONTAINER: debian:unstable-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
-
-alpine-3.12-gcc:
-  extends: .gcc-x86-64-build
-  variables:
-    CONTAINER: alpine:3.12
-
+#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-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-gcc:
+#  extends: .gcc-x86-64-build
+#  variables:
+#    CONTAINER: debian:stretch
+#
+#debian-stretch-gcc-debug:
+#  extends: .gcc-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-unstable-clang:
+#  extends: .clang-x86-64-build
+#  variables:
+#    CONTAINER: debian:unstable
+#
+#debian-unstable-clang-debug:
+#  extends: .clang-x86-64-build-debug
+#  variables:
+#    CONTAINER: debian:unstable
+#
+#debian-unstable-gcc:
+#  extends: .gcc-x86-64-build
+#  variables:
+#    CONTAINER: debian:unstable
+#
+#debian-unstable-gcc-debug:
+#  extends: .gcc-x86-64-build-debug
+#  variables:
+#    CONTAINER: debian:unstable
+#
+#debian-unstable-gcc-randconfig:
+#  extends: .gcc-x86-64-build
+#  variables:
+#    CONTAINER: debian:unstable
+#    RANDCONFIG: y
+#
+#debian-unstable-gcc-debug-randconfig:
+#  extends: .gcc-x86-64-build-debug
+#  variables:
+#    CONTAINER: debian:unstable
+#    RANDCONFIG: y
+#
+#debian-unstable-32-clang-debug:
+#  extends: .clang-x86-32-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-i386
+#
+#debian-unstable-32-gcc-debug:
+#  extends: .gcc-x86-32-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-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
+#
+#alpine-3.12-gcc:
+#  extends: .gcc-x86-64-build
+#  variables:
+#    CONTAINER: alpine:3.12
+#
 alpine-3.12-gcc-livepatch:
   extends: .gcc-x86-64-build
   variables:
@@ -476,298 +476,298 @@ alpine-3.12-gcc-livepatch:
     LIVEPATCH: y
     EXTRA_XEN_CONFIG: |
       CONFIG_LIVEPATCH=y
-
-alpine-3.12-gcc-debug:
-  extends: .gcc-x86-64-build-debug
-  variables:
-    CONTAINER: alpine:3.12
-
-alpine-3.12-clang:
-  extends: .clang-x86-64-build
-  variables:
-    CONTAINER: alpine:3.12
-
-alpine-3.12-clang-debug:
-  extends: .clang-x86-64-build-debug
-  variables:
-    CONTAINER: alpine:3.12
-
-# Arm32 cross-build
-
-debian-unstable-gcc-arm32:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-
-debian-unstable-gcc-arm32-debug:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-
-debian-unstable-gcc-arm32-randconfig:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    RANDCONFIG: y
-
-debian-unstable-gcc-arm32-debug-randconfig:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    RANDCONFIG: y
-
-debian-unstable-gcc-arm32-staticmem:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-debian-unstable-gcc-arm32-debug-staticmem:
-  extends: .gcc-arm32-cross-build-debug
-  variables:
-    CONTAINER: debian:unstable-arm64v8-arm32-gcc
-    HYPERVISOR_ONLY: y
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-# Arm builds
-
-debian-unstable-gcc-arm64:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:unstable-arm64v8
-
-debian-unstable-gcc-debug-arm64:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: debian:unstable-arm64v8
-
-debian-unstable-gcc-arm64-randconfig:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:unstable-arm64v8
-    RANDCONFIG: y
-
-debian-unstable-gcc-debug-arm64-randconfig:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: debian:unstable-arm64v8
-    RANDCONFIG: y
-
-alpine-3.12-gcc-arm64:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-
-alpine-3.12-gcc-debug-arm64:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-
-alpine-3.12-gcc-arm64-randconfig:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    RANDCONFIG: y
-
-alpine-3.12-gcc-debug-arm64-randconfig:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    RANDCONFIG: y
-
-alpine-3.12-gcc-arm64-staticmem:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-alpine-3.12-gcc-debug-arm64-staticmem:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-
-alpine-3.12-gcc-arm64-static-shared-mem:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-      CONFIG_STATIC_SHM=y
-
-alpine-3.12-gcc-debug-arm64-static-shared-mem:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_UNSUPPORTED=y
-      CONFIG_STATIC_MEMORY=y
-      CONFIG_STATIC_SHM=y
-
-alpine-3.12-gcc-arm64-boot-cpupools:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: alpine:3.12-arm64v8
-    EXTRA_XEN_CONFIG: |
-      CONFIG_EXPERT=y
-      CONFIG_UNSUPPORTED=y
-      CONFIG_SCHED_NULL=y
-      CONFIG_BOOT_TIME_CPUPOOLS=y
-
-alpine-3.12-gcc-debug-arm64-boot-cpupools:
-  extends: .gcc-arm64-build-debug
-  variables:
-    CONTAINER: alpine:3.12-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
-
-# 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-unstable-gcc-cppcheck:
-  extends: .gcc-x86-64-cross-build
-  variables:
-    CONTAINER: debian:unstable-cppcheck
-    CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-debian-unstable-gcc-arm32-cppcheck:
-  extends: .gcc-arm32-cross-build
-  variables:
-    CONTAINER: debian:unstable-cppcheck
-    CROSS_COMPILE: /usr/bin/arm-linux-gnueabihf-
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-debian-unstable-gcc-arm64-cppcheck:
-  extends: .gcc-arm64-build
-  variables:
-    CONTAINER: debian:unstable-cppcheck
-    CPPCHECK: y
-    HYPERVISOR_ONLY: y
-
-## Test artifacts common
+#
+#alpine-3.12-gcc-debug:
+#  extends: .gcc-x86-64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12
+#
+#alpine-3.12-clang:
+#  extends: .clang-x86-64-build
+#  variables:
+#    CONTAINER: alpine:3.12
+#
+#alpine-3.12-clang-debug:
+#  extends: .clang-x86-64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12
+#
+## Arm32 cross-build
+#
+#debian-unstable-gcc-arm32:
+#  extends: .gcc-arm32-cross-build
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#
+#debian-unstable-gcc-arm32-debug:
+#  extends: .gcc-arm32-cross-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#
+#debian-unstable-gcc-arm32-randconfig:
+#  extends: .gcc-arm32-cross-build
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#    RANDCONFIG: y
+#
+#debian-unstable-gcc-arm32-debug-randconfig:
+#  extends: .gcc-arm32-cross-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#    RANDCONFIG: y
+#
+#debian-unstable-gcc-arm32-staticmem:
+#  extends: .gcc-arm32-cross-build
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_EXPERT=y
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#
+#debian-unstable-gcc-arm32-debug-staticmem:
+#  extends: .gcc-arm32-cross-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8-arm32-gcc
+#    HYPERVISOR_ONLY: y
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_EXPERT=y
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#
+## Arm builds
+#
+#debian-unstable-gcc-arm64:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8
+#
+#debian-unstable-gcc-debug-arm64:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8
+#
+#debian-unstable-gcc-arm64-randconfig:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8
+#    RANDCONFIG: y
+#
+#debian-unstable-gcc-debug-arm64-randconfig:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: debian:unstable-arm64v8
+#    RANDCONFIG: y
+#
+#alpine-3.12-gcc-arm64:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#
+#alpine-3.12-gcc-debug-arm64:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#
+#alpine-3.12-gcc-arm64-randconfig:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    RANDCONFIG: y
+#
+#alpine-3.12-gcc-debug-arm64-randconfig:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    RANDCONFIG: y
+#
+#alpine-3.12-gcc-arm64-staticmem:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_EXPERT=y
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#
+#alpine-3.12-gcc-debug-arm64-staticmem:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_EXPERT=y
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#
+#alpine-3.12-gcc-arm64-static-shared-mem:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#      CONFIG_STATIC_SHM=y
+#
+#alpine-3.12-gcc-debug-arm64-static-shared-mem:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_STATIC_MEMORY=y
+#      CONFIG_STATIC_SHM=y
+#
+#alpine-3.12-gcc-arm64-boot-cpupools:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: alpine:3.12-arm64v8
+#    EXTRA_XEN_CONFIG: |
+#      CONFIG_EXPERT=y
+#      CONFIG_UNSUPPORTED=y
+#      CONFIG_SCHED_NULL=y
+#      CONFIG_BOOT_TIME_CPUPOOLS=y
+#
+#alpine-3.12-gcc-debug-arm64-boot-cpupools:
+#  extends: .gcc-arm64-build-debug
+#  variables:
+#    CONTAINER: alpine:3.12-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
+#
+## 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-unstable-gcc-cppcheck:
+#  extends: .gcc-x86-64-cross-build
+#  variables:
+#    CONTAINER: debian:unstable-cppcheck
+#    CROSS_COMPILE: /usr/bin/x86_64-linux-gnu-
+#    CPPCHECK: y
+#    HYPERVISOR_ONLY: y
+#
+#debian-unstable-gcc-arm32-cppcheck:
+#  extends: .gcc-arm32-cross-build
+#  variables:
+#    CONTAINER: debian:unstable-cppcheck
+#    CROSS_COMPILE: /usr/bin/arm-linux-gnueabihf-
+#    CPPCHECK: y
+#    HYPERVISOR_ONLY: y
+#
+#debian-unstable-gcc-arm64-cppcheck:
+#  extends: .gcc-arm64-build
+#  variables:
+#    CONTAINER: debian:unstable-cppcheck
+#    CPPCHECK: y
+#    HYPERVISOR_ONLY: y
+#
+### Test artifacts common
 
 .test-jobs-artifact-common:
   stage: build
   except: !reference [.test-jobs-common, except]
 
-# Arm test artifacts
-
-alpine-3.12-arm64-rootfs-export:
-  extends: .test-jobs-artifact-common
-  image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12-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
-
-# x86_64 test artifacts
-
+## Arm test artifacts
+#
+#alpine-3.12-arm64-rootfs-export:
+#  extends: .test-jobs-artifact-common
+#  image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12-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
+#
+## x86_64 test artifacts
+#
 alpine-3.12-rootfs-export:
   extends: .test-jobs-artifact-common
   image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 57b091d1e7..6bc05aff31 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -106,273 +106,273 @@
     - qubes-hw2
 
 # 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
-    - 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.12-gcc-arm64
-
-adl-smoke-x86-64-gcc:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.12-gcc
-
-adl-suspend-x86-64-gcc:
-  extends: .adl-x86-64
-  script:
-    - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
-  needs:
-    - *x86-64-test-needs
-    - alpine-3.12-gcc
-
-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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.12-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-unstable-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-unstable-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
+#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
+#    - 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.12-gcc-arm64
+#
+#adl-smoke-x86-64-gcc:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.12-gcc
+#
+#adl-suspend-x86-64-gcc:
+#  extends: .adl-x86-64
+#  script:
+#    - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE}
+#  needs:
+#    - *x86-64-test-needs
+#    - alpine-3.12-gcc
+#
+#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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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.12-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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-unstable-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.12-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-unstable-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-unstable-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-alpine-x86_64-gcc-livepatch:
   extends: .qemu-x86-64
diff --git a/automation/scripts/build b/automation/scripts/build
index 2f9ef2d8ba..c6a421dc4a 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -108,7 +108,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 \