add hacks.skip_uefi_tests_on_older_rhcos

On older RHCOS (i.e. 4.9) the UEFI+`iso-live-login` test isn't passing right now and the `iso-as-disk` test doesn't exist at all. Let's skip these for now. This will last until we either investigate and fix the failures or 4.9 no longer exists.
coreos · Nov 15, 2022 · fab14eb · fab14eb
1 parent de419ed
commit fab14eb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/docs/config.yaml b/docs/config.yaml
@@ -34,6 +34,8 @@ hacks:
   skip_upgrade_tests: true
   # OPTIONAL: skip calling plume in the release job
   skip_plume_release_task: true
+  # OPTIONAL: skip UEFI on older RHCOS
+  skip_uefi_tests_on_older_rhcos: true
 
 # OPTIONAL/TEMPORARY: whether to use `versionary` to derive version numbers
 versionary_hack: true

diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile
@@ -355,23 +355,33 @@ lock(resource: "build-${params.STREAM}") {
 
         // Run Kola TestISO tests for metal artifacts
         if (shwrapCapture("cosa meta --get-value images.live-iso") != "None") {
-            stage("Kola:TestISO") {
-                kolaTestIso(cosaDir: env.WORKSPACE, arch: basearch,
-                            skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack)
-                // For now we want to notify ourselves when a particular workaround is observed.
-                // It won't fail the build, just give us information.
-                // https://github.com/coreos/fedora-coreos-tracker/issues/1233
-                // XXX: This relies on implementation details in kolatestIso(),
-                //      but since this is a hack and probably short lived that's OK.
-                // First check to make sure the files exist, then grep for the workaround.
-                shwrap("cosa shell -- ls tmp/kolaTestIso-*/kola-testiso-uefi/insecure/{iso-live-login,iso-as-disk}/console.txt")
-                def grepRc = shwrapRc("""
-                     cosa shell -- grep 'tracker issue workaround engaged for .*issues/1233' \
-                        tmp/kolaTestIso-*/kola-testiso-uefi/insecure/{iso-live-login,iso-as-disk}/console.txt
-                """)
-                if (grepRc == 0) {
-                    warnError(message: 'Detected used workaround for #1233') {
-                        error('Detected used workaround for #1233')
+            if (pipecfg.hacks?.skip_uefi_tests_on_older_rhcos &&
+                (params.STREAM in ['4.6', '4.7', '4.8', '4.9'])) {
+                // UEFI tests on x86_64 seem to fail on older RHCOS. skip UEFI tests here.
+                stage("Kola:TestISO") {
+                    kolaTestIso(cosaDir: env.WORKSPACE, arch: basearch,
+                                skipUEFI: true,
+                                skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack)
+                }
+            } else {
+                stage("Kola:TestISO") {
+                    kolaTestIso(cosaDir: env.WORKSPACE, arch: basearch,
+                                skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack)
+                    // For now we want to notify ourselves when a particular workaround is observed.
+                    // It won't fail the build, just give us information.
+                    // https://github.com/coreos/fedora-coreos-tracker/issues/1233
+                    // XXX: This relies on implementation details in kolatestIso(),
+                    //      but since this is a hack and probably short lived that's OK.
+                    // First check to make sure the files exist, then grep for the workaround.
+                    shwrap("cosa shell -- ls tmp/kolaTestIso-*/kola-testiso-uefi/insecure/{iso-live-login,iso-as-disk}/console.txt")
+                    def grepRc = shwrapRc("""
+                         cosa shell -- grep 'tracker issue workaround engaged for .*issues/1233' \
+                            tmp/kolaTestIso-*/kola-testiso-uefi/insecure/{iso-live-login,iso-as-disk}/console.txt
+                    """)
+                    if (grepRc == 0) {
+                        warnError(message: 'Detected used workaround for #1233') {
+                            error('Detected used workaround for #1233')
+                        }
                     }
                 }
             }