From d328db94854a26085c30a257039b2a8b8097031d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 26 Feb 2024 13:32:40 +0100 Subject: [PATCH] ci: Use 'centos-release' package to detect if we are testing CentOS Stream Until https://github.com/openshift/os/issues/1237 is resolved, we need to skip Secure Boot tests for CentOS Stream based variants. As we now use CentOS Stream packages for other variants than the `scos` one for pre-testing, we can not rely on the variant name and instead have to look at the list of included packages to differentiate between RHEL and CentOS Stream based builds. --- ci/prow-entrypoint.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index fdd5b25a..c278205d 100755 --- a/ci/prow-entrypoint.sh +++ b/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