Merge pull request #1448 from travier/ci-skip-secure-boot-centos-stream

NO-JIRA: ci: Use 'centos-release' package to detect if we are testing CentOS Stream

ci/prow-entrypoint.sh

@@ -123,12 +123,7 @@ kola_test_qemu() {
 
     # Skip Secure Boot tests on SCOS for now
     # See: https://github.com/openshift/os/issues/1237
-    if [[ -f "src/config.json" ]]; then
-        variant="$(jq --raw-output '."coreos-assembler.config-variant"' 'src/config.json')"
-    else
-        variant="default"
-    fi
-    if [[ "${variant}" != "scos" ]]; then
+    if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "centos-release"; then
         cosa kola --basic-qemu-scenarios
     else
         cosa kola --basic-qemu-scenarios --skip-secure-boot

kola-denylist.yaml

@@ -1,57 +1,55 @@
 # This file documents currently known-to-fail kola tests. It is consumed by
 # coreos-assembler to automatically skip some tests. For more information,
 # see: https://github.com/coreos/coreos-assembler/pull/866.
-- pattern: iso-live-login.uefi-secure
-  tracker: https://github.com/openshift/os/issues/1237
-  snooze: 2024-02-26
-  osversion:
-  - rhel-9.4
-
-- pattern: iso-as-disk.uefi-secure
-  tracker: https://github.com/openshift/os/issues/1237
-  snooze: 2024-02-26
-  osversion:
-  - rhel-9.4
-
-- pattern: basic
-  tracker: https://github.com/openshift/os/issues/1237
-  snooze: 2024-02-26
-  osversion:
-  - rhel-9.4
-
-- pattern: ext.config.rpm-ostree.replace-rt-kernel
-  tracker: https://github.com/openshift/os/issues/1315
-  osversion:
-    - c9s
 
+# RHEL 9.4 with CentOS Stream test snooze
 - pattern: iso-live-login.uefi-secure
   tracker: https://github.com/openshift/os/issues/1237
+  snooze: 2024-03-18
   osversion:
-  - c9s
+    - rhel-9.4
 
 - pattern: iso-as-disk.uefi-secure
   tracker: https://github.com/openshift/os/issues/1237
+  snooze: 2024-03-18
   osversion:
-  - c9s
+    - rhel-9.4
 
 - pattern: ext.config.rpm-ostree.replace-rt-kernel
   tracker: https://github.com/openshift/os/issues/1383
-  snooze: 2024-02-26
+  snooze: 2024-03-18
   osversion:
     - rhel-9.4
 
 - pattern: ext.config.shared.content-origins
   tracker: https://github.com/openshift/os/issues/1387#issuecomment-1769313807
-  snooze: 2024-02-26
+  snooze: 2024-03-18
   osversion:
     - rhel-9.4
 
 - pattern: ext.config.version.rhel-matches-rhcos-build
   tracker: https://github.com/openshift/os/issues/1387#issuecomment-1769313807
-  snooze: 2024-02-26
+  snooze: 2024-03-18
   osversion:
     - rhel-9.4
 
+# CentOS Stream specific indefinite snooze
+- pattern: iso-live-login.uefi-secure
+  tracker: https://github.com/openshift/os/issues/1237
+  osversion:
+    - c9s
+
+- pattern: iso-as-disk.uefi-secure
+  tracker: https://github.com/openshift/os/issues/1237
+  osversion:
+    - c9s
+
+- pattern: ext.config.rpm-ostree.replace-rt-kernel
+  tracker: https://github.com/openshift/os/issues/1315
+  osversion:
+    - c9s
+
+# Other failing tests
 - pattern: pxe-*.ppcfw
   tracker: https://github.com/coreos/coreos-assembler/issues/3370
   # nb: testiso doesn't read this, so it's just for consistency