From f779213c9af7abc42873e4642f6775d7ce4efabe 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 1/3] ci: Skip Secure Boot tests for SCOS --- 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 22e192834..cf7c4970b 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -117,7 +117,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 db54842e16efbdc28b6a3fd8cfbeb0653423fda9 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 2/3] denylist: Skip Secure Boot tests for SCOS --- kola-denylist.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kola-denylist.yaml b/kola-denylist.yaml index c2a480027..6d65b5447 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 From ea46e824a407a20d3bd2ab5fc5810b7b3ab89f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 4 Apr 2023 12:02:47 +0200 Subject: [PATCH 3/3] ci/prow-entrypoint: Use a separated directory for each kola run Keep a distinct directory for test output for each kola run. --- ci/prow-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index cf7c4970b..2905404e8 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -131,7 +131,7 @@ kola_test_qemu() { 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