CherryPicked: [cnv-4.22] Add exclude filter to verify_boot_sources_reimported#5561
Merged
Conversation
After enabling common boot image imports, `verify_boot_sources_reimported` checks all DIC-managed DataSources. If the cluster has custom DataImportCron templates whose DataSources lack valid sources, the verification fails waiting for DataSources that will never become Ready. This PR adds an optional `exclude_data_source_names` denylist parameter so callers can skip specific DataSources. The default remains "verify all", which is backward compatible and automatically covers multiarch DataSource names (e.g. `fedora-aarch64`) and valid custom templates without requiring an explicit allowlist. The parameter is propagated through `disable_common_boot_image_import_hco_spec` so that `test_add_custom_data_import_cron_template_disable_spec` can exclude the custom DataSource during teardown verification. This PR also de-quarantines `test_add_custom_data_import_cron_template_disable_spec`, which was quarantined due to the teardown `AssertionError` in `verify_boot_sources_reimported` (CNV-88015). The fix resolves the root cause, so the quarantine marker is removed. [CNV-88015](https://redhat.atlassian.net/browse/CNV-88015) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **New Features** * Added support for excluding specific data sources during boot image import checks and re-enable flows. * Added a new test fixture that disables boot image import while excluding a custom data source. * **Tests** * Updated unit tests to verify the exclusion list is passed through correctly. * Removed an expected-failure marker from an updated boot image import test. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Ramon Lobillo Mateos <rlobillo@redhat.com>
Contributor
|
@rlobillo — AI automatically resolved merge conflicts for this cherry-pick. Please review the changes carefully and verify correctness before merging. |
|
Report bugs in Issues Welcome! 🎉This pull request will be automatically processed with the following features: 🔄 Automatic Actions
📋 Available CommandsPR Status Management
Review & Approval
Testing & Validation
Container Operations
Cherry-pick Operations
Branch Management
Label Management
✅ Merge RequirementsThis PR will be automatically approved when the following conditions are met:
📊 Review ProcessApprovers and ReviewersApprovers:
Reviewers:
Available Labels
AI Features
Security Checks
💡 Tips
📌 Additional InformationCustom Commands:
For more information, please refer to the project documentation or contact the maintainers. |
openshift-virtualization-qe-bot
added
the
tox:verify-tc-requirement-polarion:running
openshift-virtualization-qe-bot-6
requested review from
OhadRevah,
RoniKishner,
hmeir and
vsibirsk
July 8, 2026 10:07
openshift-virtualization-qe-bot
added
tox:verify-tc-requirement-polarion:passed
|
/build-and-push-container |
Contributor
|
New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-5561 published |
|
/verified All tests passed for PR #5561. Execution details |
rlobillo
approved these changes
Jul 8, 2026
hmeir
approved these changes
Jul 8, 2026
Collaborator
|
/approve |
|
Successfully removed PR tag: quay.io/openshift-cnv/openshift-virtualization-tests:pr-5561. |
|
New container for quay.io/openshift-cnv/openshift-virtualization-tests:cnv-4.22 published |
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
9 participants
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.
Cherry-pick from
mainbranch, original PR: #4983, PR owner: rlobillo