Skip to content
/ os Public
forked from openshift/os

Commit

Permalink
ci: Remove Secure Boot test workaround
Browse files Browse the repository at this point in the history
Update kola denylist with the new tests names.

See: openshift#1237
See: coreos/coreos-assembler#3652
  • Loading branch information
travier committed Apr 17, 2024
1 parent 0d8d850 commit a75ad26
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 29 deletions.
22 changes: 0 additions & 22 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,28 +115,6 @@ cosa_build() {
# Build QEMU image and run all kola tests
kola_test_qemu() {
cosa buildextend-qemu

# Skip Secure Boot tests on SCOS for now
# See: https://github.com/openshift/os/issues/1237
# Due to the changes in https://github.com/coreos/coreos-assembler/pull/3652
# we need to check if the basic.nvme is available in the list of tests
local args=""
local manifest="src/config/manifest.yaml"
if [[ -f "src/config.json" ]]; then
variant="$(jq --raw-output '."coreos-assembler.config-variant"' 'src/config.json')"
manifest="src/config/manifest-${variant}.yaml"
fi
if cosa kola list --json | jq -r '.[].Name' | grep "basic.nvme"; then
if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep "centos-stream-release"; then
args+="--denylist-test *.uefi-secure"
fi
else
if ! rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep "centos-stream-release"; then
cosa kola --basic-qemu-scenarios --output-dir ${ARTIFACT_DIR:-/tmp}/kola-basic
else
cosa kola --basic-qemu-scenarios --skip-secure-boot --output-dir ${ARTIFACT_DIR:-/tmp}/kola-basic
fi
fi
cosa kola run ${args} --parallel 2 --output-dir ${ARTIFACT_DIR:-/tmp}/kola
}

Expand Down
9 changes: 2 additions & 7 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@
# coreos-assembler to automatically skip some tests. For more information,
# see: https://github.com/coreos/coreos-assembler/pull/866.

# RHEL 9.4 with CentOS Stream test snooze
- pattern: basic
tracker: https://github.com/openshift/os/issues/1237
snooze: 2024-04-01
osversion:
- rhel-9.4

- pattern: iso-live-login.uefi-secure
tracker: https://github.com/openshift/os/issues/1237
snooze: 2024-04-01
osversion:
- rhel-9.4
- c9s

- pattern: iso-as-disk.uefi-secure
tracker: https://github.com/openshift/os/issues/1237
snooze: 2024-04-01
osversion:
- rhel-9.4
- c9s

- pattern: ext.config.rpm-ostree.replace-rt-kernel
tracker: https://github.com/openshift/os/issues/1383
Expand Down

0 comments on commit a75ad26

Please sign in to comment.