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.

Sign up for GitHub

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

NO-JIRA: ci: Use 'centos-release' package to detect if we are testing CentOS Stream #1448

Merged
merged 5 commits into from
Feb 26, 2024
Merged

NO-JIRA: ci: Use 'centos-release' package to detect if we are testing CentOS Stream #1448

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d328db9
ci: Use 'centos-release' package to detect if we are testing CentOS S…
travier Feb 26, 2024
81e5134
kola-denylist: Do not snooze basic tests anymore
travier Feb 26, 2024
b9ad9b3
kola-denylist: Update RHCOS 9.4 snooze dates
travier Feb 26, 2024
fe6cda6
kola-denylist: Use uniform identing
travier Feb 26, 2024
058f5ca
kola-denylist: Regroup test snooze by variant
travier Feb 26, 2024
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
7 changes: 1 addition & 6 deletions ci/prow-entrypoint.sh
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

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

This logic looks inverted. If centos-release is present then we need to skip Secure Boot tests, not the other way around.

I think the reason this passed CI is that this condition happened to fail on another error, which is that manifest is not defined:

/src/ci/prow-entrypoint.sh: line 126: manifest: unbound variable

And I think the reason set -e didn't kick in here is likely a combination of it being in an if-statement and piping things.

Copy link
Member

Choose a reason for hiding this comment

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

Proposing to fix this in #1458.

Copy link
Member Author

Choose a reason for hiding this comment

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

Arg, thanks for noticing

cosa kola --basic-qemu-scenarios
else
cosa kola --basic-qemu-scenarios --skip-secure-boot
Expand Down