mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
CI: Fix microcode loading on Xen 4.20
CONFIG_UCODE_SCAN_DEFAULT only exists in Xen 4.21. In older versions of xen,
use ucode=scan on the command line.
Fixes: 690655a511 ("CI: Include microcode for x86 hardware jobs")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
1 parent
c173a77188
commit
efee710407
3 files changed
+3
-4
No files matched your search
@@ -306,7 +306,6 @@ 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:
|
||||
|
||||
@@ -247,14 +247,14 @@ TFTP=/scratch/gitlab-runner/tftp
|
||||
CONTROLLER=control@thor.testnet
|
||||
|
||||
echo "
|
||||
multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts
|
||||
multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot ucode=scan $extra_xen_opts
|
||||
module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
|
||||
module2 --nounzip (http)/gitlab-ci/initrd-dom0
|
||||
" > $TFTP/grub.cfg
|
||||
|
||||
echo "#!ipxe
|
||||
|
||||
kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot
|
||||
kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot ucode=scan $extra_xen_opts || reboot
|
||||
module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot
|
||||
module /gitlab-ci/initrd-dom0 || reboot
|
||||
boot
|
||||
|
||||
@@ -15,7 +15,7 @@ WORKDIR="${PWD}"
|
||||
TEST="$1"
|
||||
PASS_MSG="Test passed: ${TEST}"
|
||||
XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G"
|
||||
XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot"
|
||||
XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot ucode=scan"
|
||||
XEN_CMD_EXTRA=""
|
||||
DOM0_CMD=""
|
||||
DOMU_CMD=""
|
||||
|
||||