From e6c6da39bcff0c96dc0713a021b8efcfab71c52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 9 Jul 2026 21:57:05 +0200 Subject: [PATCH] CI: Enable FRED on the PTL runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new job-level EXTRA_XEN_OPTS variable, in addition to CONSOLE_OPTS. FRED is not yet enabled by default on Intel systems, but is expected to function. Explicitly turn it on for added test coverage in the short term. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper (cherry picked from commit d9e36605ff1d6888d3934f7c7452da781aee37d7) --- automation/gitlab-ci/test.yaml | 1 + automation/scripts/qubes-x86_64.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 7cc5214630..61adc1baff 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -177,6 +177,7 @@ PCIDEV: "56:00.0" PCIDEV_INTR: "MSI-X" CONSOLE_OPTS: "console=com1 com1=115200,8n1" + EXTRA_XEN_OPTS: "fred" SUT_ADDR: test-22.testnet tags: - qubes-hw22 diff --git a/automation/scripts/qubes-x86_64.sh b/automation/scripts/qubes-x86_64.sh index 7a59fa5f11..065f03931b 100755 --- a/automation/scripts/qubes-x86_64.sh +++ b/automation/scripts/qubes-x86_64.sh @@ -260,14 +260,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 watchdog $extra_xen_opts +multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $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 watchdog $extra_xen_opts || reboot +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $extra_xen_opts || reboot module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot module /gitlab-ci/initrd-dom0 || reboot boot