Skip to content

Add multiarch support for golden image boot source tests#5662

Open
geetikakay wants to merge 1 commit into
RedHatQE:mainfrom
geetikakay:multiarch_2_ds_dic
Open

Add multiarch support for golden image boot source tests#5662
geetikakay wants to merge 1 commit into
RedHatQE:mainfrom
geetikakay:multiarch_2_ds_dic

Conversation

@geetikakay

@geetikakay geetikakay commented Jul 16, 2026

Copy link
Copy Markdown
Contributor
What this PR does / why we need it:

Add multiarch support for golden image and boot source tests

  • Add data_import_cron_matrix and auto_update_data_source_matrix per
    architecture in global_config_multiarch
  • Propagate per-arch DIC and auto-update matrices in
    update_cpu_arch_related_config for multiarch clusters
  • Create arch-aware fedora_boot_source_data_source fixture replacing
    hardcoded fedora_data_source
  • Use ArchImages for per-arch Fedora registry URL in imported_fedora_dv
  • Filter RHEL DICs by architecture suffix in test_updated_rhel_image
  • Add architecture parameter to template_labels helper
  • Append cpu_arch label to template selector in get_template_by_labels
  • Add arm64 marker to boot source VM and opt-out tests
  • Remove unused Cirros.RAW_IMG_XZ override from arm64 config
  • Update unit tests for multiarch DIC and auto-update matrix propagation
Which issue(s) this PR fixes:
Special notes for reviewer:
jira-ticket:

https://redhat.atlassian.net/browse/CNV-68645

Summary by CodeRabbit

  • Bug Fixes

    • Improved multi-architecture handling for Fedora and RHEL boot sources, templates, and data imports.
    • Ensured template selection matches the configured CPU architecture.
    • Added architecture-specific data import and automatic update configurations for AMD64 and ARM64.
  • Tests

    • Expanded ARM64 coverage for boot source, data import, and template scenarios.
    • Updated validation to account for architecture-specific data sources and labels.

- Populate per-arch data_import_cron_matrix and auto_update_data_source_matrix
in multiarch config.
- Make boot source fixtures, template label selectors and
DIC filtering arch-aware.
- Add arm64 marker to applicable tests. Update unit
tests for matrix propagation.

Signed-off-by: Geetika Kapoor <gkapoor@redhat.com>
@coderabbitai

coderabbitai Bot commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Multi-architecture golden images

Layer / File(s) Summary
Matrix configuration and propagation
tests/global_config_arm64.py, tests/global_config_multiarch.py, utilities/pytest_utils.py, utilities/unittests/test_pytest_utils.py
Adds architecture-specific data-import and auto-update matrices, propagates them into py_config, and verifies amd64 and arm64 behavior. Removes the ARM64 Cirros image override.
Architecture-aware boot sources and templates
tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py, tests/infrastructure/golden_images/update_boot_source/utils.py, utilities/virt.py
Selects Fedora data sources, registry URLs, template labels, and template matches using the configured CPU architecture; marks relevant tests for ARM64.
Architecture-aware cron validation
tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py, tests/infrastructure/golden_images/update_boot_source/test_boot_sources_vm.py
Filters and validates RHEL DataImportCron entries using architecture-specific managed data sources and adds ARM64 test markers.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Possibly related PRs

Suggested reviewers: vsibirsk, rnetser, ronikishner, dshchedr

🚥 Pre-merge checks | ✅ 6
✅ Passed checks (6 passed)
Check name Status Explanation
Title check ✅ Passed The title is concise, under 120 characters, and accurately summarizes the multiarch boot source test work.
Description check ✅ Passed The PR description matches the template structure and covers the main change, though the issue and special notes sections are left blank.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stp Link Required ✅ Passed No new test files or new test functions were added; the PR only modifies existing tests, so the STP-link requirement does not apply.
Stp Scenario Coverage ✅ Passed No modified test module in this PR contains an STP-linked docstring, so the scenario-coverage check is not applicable.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-virtualization-qe-bot-6

Copy link
Copy Markdown

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

  • Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
  • Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
  • Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
  • Branch Labeling: Branch-specific labels are applied to track the target branch
  • Auto-verification: Auto-verified users have their PRs automatically marked as verified
  • Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, needs-rebase, size, verified, wip

📋 Available Commands

PR Status Management

  • /wip - Mark PR as work in progress (adds WIP: prefix to title)
  • /wip cancel - Remove work in progress status
  • /hold - Block PR merging (approvers only)
  • /hold cancel - Unblock PR merging
  • /verified - Mark PR as verified
  • /verified cancel - Remove verification status
  • /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
  • /regenerate-welcome - Regenerate this welcome message
  • /security-override - Set security check runs to pass (maintainers only)
  • /security-override cancel - Re-run security checks

Review & Approval

  • /lgtm - Approve changes (looks good to me)
  • /approve - Approve PR (approvers only)
  • /assign-reviewers - Assign reviewers based on OWNERS file
  • /assign-reviewer @username - Assign specific reviewer
  • /check-can-merge - Check if PR meets merge requirements

Testing & Validation

  • /retest tox - Run Python test suite with tox
  • /retest build-container - Rebuild and test container image
  • /retest verify-bugs-are-open - verify-bugs-are-open
  • /retest all - Run all available tests

Container Operations

  • /build-and-push-container - Build and push container image (tagged with PR number)
    • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

  • /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
    • Multiple branches: /cherry-pick branch1 branch2 branch3
  • /cherry-pick-retry <branch> - Retry a failed cherry-pick (merged PRs only)

Branch Management

  • /rebase - Rebase this PR branch onto its base branch

Label Management

  • /<label-name> - Add a label to the PR
  • /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

  1. Approval: /approve from at least one approver
  2. LGTM Count: Minimum 2 /lgtm from reviewers
  3. Status Checks: All required status checks must pass
  4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
  5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

  • dshchedr
  • myakove
  • rnetser
  • vsibirsk

Reviewers:

  • RoniKishner
  • dshchedr
  • geetikakay
  • mijankow
  • rnetser
  • vsibirsk
Available Labels
  • hold
  • verified
  • wip
  • lgtm
  • approve
AI Features
  • Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6-1m)
Security Checks
  • Suspicious Path Detection: Monitors paths: .claude/, .vscode/, .cursor/, .devcontainer/, .pi/, .github/workflows/, .github/actions/
  • Committer Identity Check: Verifies last committer matches PR author
  • Mandatory: Security checks block merge (use /security-override to bypass — maintainers only)

💡 Tips

  • WIP Status: Use /wip when your PR is not ready for review
  • Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
  • Cherry-picking: Cherry-pick labels are processed when the PR is merged
  • Container Builds: Container images are automatically tagged with the PR number
  • Permission Levels: Some commands require approver permissions
  • Auto-verified Users: Certain users have automatic verification and merge privileges

📌 Additional Information

Custom Commands:

  • /test-plan — Triggers CodeRabbit to analyze the PR's changed files and post a test execution plan
  • /rerun-smoke — Adds retest-smoke label on the PR to trigger smoke tests execution

For more information, please refer to the project documentation or contact the maintainers.

@codecov

codecov Bot commented Jul 16, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.87%. Comparing base (a2dc143) to head (a48840c).
⚠️ Report is 254 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5662      +/-   ##
==========================================
+ Coverage   98.67%   98.87%   +0.20%     
==========================================
  Files          25       42      +17     
  Lines        2487     2580      +93     
==========================================
+ Hits         2454     2551      +97     
+ Misses         33       29       -4     
Flag Coverage Δ
utilities 98.87% <100.00%> (+0.20%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py`:
- Line 124: Update the assertion lambda in the boot-source test to compare
fedora_boot_source_data_source.source.name directly with OS_FLAVOR_FEDORA,
rather than fedora_boot_source_data_source.name, so architecture suffixes do not
cause false negatives.

In
`@tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py`:
- Around line 56-58: Update the assertions in the SSP data import cron test:
correct the grammar in the managed_data_source assertion message to say it “does
not exist,” and add a descriptive failure message to the
latest_rhel_release_versions_dict comparison assertion.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: caf44435-ea37-4d87-aa5d-d4a849971fc5

📥 Commits

Reviewing files that changed from the base of the PR and between fd43a47 and a48840c.

📒 Files selected for processing (9)
  • tests/global_config_arm64.py
  • tests/global_config_multiarch.py
  • tests/infrastructure/golden_images/update_boot_source/test_boot_sources_vm.py
  • tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py
  • tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py
  • tests/infrastructure/golden_images/update_boot_source/utils.py
  • utilities/pytest_utils.py
  • utilities/unittests/test_pytest_utils.py
  • utilities/virt.py
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • RedHatQE/openshift-virtualization-tests-design-docs (manual)
💤 Files with no reviewable changes (1)
  • tests/global_config_arm64.py

@dshchedr

Copy link
Copy Markdown
Collaborator

/approve

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants