Skip to content

Commit

Permalink
ci: Use 'centos-release' package to detect if we are testing CentOS S…
Browse files Browse the repository at this point in the history
…tream

Until openshift#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.
  • Loading branch information
travier committed Feb 26, 2024
1 parent 973b01d commit d328db9
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d328db9

Please sign in to comment.