Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Skip Secure Boot tests for SCOS #1238

Merged
merged 3 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,21 @@ 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
cosa kola run --parallel 2 --output-dir tmp/kola-all
}

# Build metal, metal4k & live images and run kola tests
Expand Down
10 changes: 10 additions & 0 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +29 to +37
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that could be a single pattern: *.uefi-secure entry. But obviously fine as is too!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Will be for next time.