jobs/kola-upgrade: add more conditions for secureboot

Apparently there are some F34 versions of `next` that are affected by coreos/fedora-coreos-tracker#1452 so let's account for that.
dustymabe · Apr 5, 2023 · 4342a31 · 4342a31
1 parent 274a97a
commit 4342a31
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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) {