diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 22e19283..2905404e 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -117,9 +117,21 @@ cosa_build() { # Build QEMU image and run all kola tests kola_test_qemu() { cosa buildextend-qemu - cosa kola --basic-qemu-scenarios + + # 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 + cosa kola --basic-qemu-scenarios + else + cosa kola --basic-qemu-scenarios --skip-secure-boot + fi kola run-upgrade -b rhcos -v --find-parent-image --qemu-image-dir tmp/ --output-dir tmp/kola-upgrade - cosa kola run --parallel 2 + cosa kola run --parallel 2 --output-dir tmp/kola-all } # Build metal, metal4k & live images and run kola tests diff --git a/kola-denylist.yaml b/kola-denylist.yaml index c2a48002..6d65b544 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -25,3 +25,13 @@ - pattern: ext.config.shared.networking.nmstate.* tracker: https://github.com/openshift/os/issues/1228 snooze: 2023-04-17 + +- 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