From 4a39780faafa79034aa4f637ab8a3f1922b95919 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 11 Apr 2025 20:28:15 +0100 Subject: [PATCH] CI: Include microcode for x86 hardware jobs All the x86 hardware runners are out of date, to varying degrees, in terms of microcode. Microcode must be uncompressed and prepended to the initrd in order for Xen to be able to use it during early boot. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- automation/gitlab-ci/build.yaml | 1 + automation/gitlab-ci/test.yaml | 6 ++++++ automation/scripts/qubes-x86-64.sh | 3 ++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 1b82b359d0..ac53678745 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_UCODE_SCAN_DEFAULT=y CONFIG_XHCI=y debian-12-x86_64-gcc-debug: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ef3560930c..5ce445b78f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -26,6 +26,9 @@ - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master .qemu-arm64: extends: .test-jobs-common @@ -247,6 +250,9 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86 + ref: master adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 3947027d6e..1f90e7002c 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -188,7 +188,8 @@ Kernel \r on an \m (\l) fi # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz # test-local configuration diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 1f8cc172c6..5bb44188dc 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -106,7 +106,8 @@ cd .. rm -rf rootfs # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" == argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -- 2.39.5