From 904f8e4066b1227810240dea45c7a52e61591f9c Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Mon, 10 Apr 2023 10:11:04 -0300 Subject: [PATCH 1/3] Bump fedora-coreos-config Dusty Mabe (1): coreos-teardown-initramfs: teardown after NM has exited Renata Ravanelli (3): overlay.d: create new 30gcp-udev-rules overlay overlay.d: Add/Update udev rules for GCP Add 30gcp-udev-rules overlay to the manifest Signed-off-by: Renata Ravanelli --- fedora-coreos-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-coreos-config b/fedora-coreos-config index c617192be..da113f7a9 160000 --- a/fedora-coreos-config +++ b/fedora-coreos-config @@ -1 +1 @@ -Subproject commit c617192bebd3d8396a7d9dc0931900cdcdea09bd +Subproject commit da113f7a9e87fffa23c1ed34d6e41822e767edf7 From 48447a486322eb29fe2d26de0e81c426841f8e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 27 Oct 2022 13:24:01 +0200 Subject: [PATCH 2/3] ci: Skip Secure Boot tests for SCOS (cherry picked from commit f779213c9af7abc42873e4642f6775d7ce4efabe) --- ci/prow-entrypoint.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index db5876e19..4cd9e041d 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -116,7 +116,19 @@ 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 } From 51592be281e7409644c45dd1ee71d4f417df70bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 4 Apr 2023 10:25:02 +0200 Subject: [PATCH 3/3] denylist: Skip Secure Boot tests for SCOS (cherry picked from commit db54842e16efbdc28b6a3fd8cfbeb0653423fda9) --- kola-denylist.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kola-denylist.yaml b/kola-denylist.yaml index cd69536c2..e462e6dbd 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -61,5 +61,13 @@ # lift when systemd in c9s has the compat patch - pattern: ext.config.systemd.journal-compat tracker: https://github.com/openshift/os/pull/1230 + +- 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