From 0645dd9500970a57e91f4d3905ea05408c750e30 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 5 Apr 2023 15:59:48 -0400 Subject: [PATCH] jobs/kola-upgrade: add more conditions for secureboot Apparently there are some F34 versions of `next` that are affected by https://github.com/coreos/fedora-coreos-tracker/issues/1452 so let's account for that. --- jobs/kola-upgrade.Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jobs/kola-upgrade.Jenkinsfile b/jobs/kola-upgrade.Jenkinsfile index d95a55717..6d22ea921 100644 --- a/jobs/kola-upgrade.Jenkinsfile +++ b/jobs/kola-upgrade.Jenkinsfile @@ -195,9 +195,14 @@ EOF k1.extraArgs += " --qemu-firmware=uefi" k1.marker = "uefi" parallelruns['Kola:UEFI'] = { kola(k1) } - if ((start_version[0..1] as Integer) >= 34) { - // SecureBoot doesn't work on < 34 with latest qemu - // https://github.com/coreos/fedora-coreos-tracker/issues/1452 + // SecureBoot doesn't work on older FCOS builds with latest qemu + // so we must run it conditionally. + // https://github.com/coreos/fedora-coreos-tracker/issues/1452 + def secureboot_start_version = 34 + if (start_stream == 'next') { + secureboot_start_version = 35 + } + if ((start_version[0..1] as Integer) >= secureboot_start_version) { k2 = kolaparams.clone() k2.extraArgs += " --qemu-firmware=uefi-secure" if ((start_version[0..1] as Integer) <= 37) {