Conversation
The ensure_rpm_usable_before_tests fixture was causing test Errors on RHEL 9.x (where rpm-sequoia doesn't exist) and on RHEL 10 when RHUI repos return 404. Now skips on non-RHEL-10 and handles 404/403/not registered/not installed errors gracefully. Verified on a live RHEL 9.8 Azure VM: 0 Errors (was 29).
- test_number_gpg_keys: detect pqrpm db and expect 0 keys in default rpmdb when keys are stored there (RHEL 9.8 Azure) - test_number_gpg_keys: use rpm -qa instead of rpm -q to avoid counting "package not installed" message as a line - test_pqrpm_gpg_keys: extend to Azure (3 keys) instead of OCI-only - test_rhui_certificate_date: add '-ha' to source_suffixes so HA images resolve to content-ha.crt instead of content-base.crt Verified on a live RHEL 9.8 HA Azure VM: all 3 tests pass.
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Collaborator
Author
|
Superseded by a cleaner PR with only the relevant fixes (conftest.py changes already merged separately). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes multiple CIV test failures on RHEL 9.8 Azure images:
ensure_rpm_usable_before_testsfixture: Was causing 29 test Errors by runningyum -y update rpm-sequoia openssl-libson RHEL 9 where repos return 404. Now handles404,403,"not registered", and"not installed"errors gracefully instead of asserting.test_number_gpg_keys: On RHEL 9.8 Azure, GPG keys moved to the pqrpm db (/usr/lib/pqrpm/lib/sysimage/rpm). Updated to detect pqrpm and expect 0 keys in the default rpmdb. Also fixedrpm -q→rpm -qato avoid counting the "package not installed" error message.test_pqrpm_gpg_keys: Extended from OCI-only to also run on Azure (expects 3 keys: 2 Red Hat + 1 Microsoft).test_rhui_certificate_date: Added'-ha'tosource_suffixesso HA images resolve tocontent-ha.crtinstead ofcontent-base.crt.Test plan
rhel-ha-azure-9.8-20260908.3.x86_64.vhd) oneastustest_number_gpg_keys,test_pqrpm_gpg_keys, andtest_rhui_certificate_dateall pass