Manual Cherry-pick: [4.22] Add support for multiarch dedicated tests (#5124)

[hmeir]

Short description:

Manual Cherry-pick from #5124

More details:

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for reviewer:

jira-ticket:

Summary by CodeRabbit

• New Features
  • Added multi-architecture-aware test selection, including conditional handling of multiarch-marked tests by cluster type.
  • Introduced a dedicated CI test environment to collect architecture-specific and combined multiarch test sets.
• Bug Fixes
  • Improved robustness when image/architecture configuration values are missing.
  • Refined architecture filtering and more informative architecture output during test runs.
• Documentation
  • Reworked the multi-architecture guide with clearer run-mode, selection rules, and dedicated-test conventions.
• Tests
  • Expanded unit and collection behavior coverage for multiarch selection and architecture parsing.

[openshift-virtualization-qe-bot]

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
• jpeimer
• myakove
• rnetser
• vsibirsk

Reviewers:

• Ahmad-Hafe
• OhadRevah
• RoniKishner
• SamAlber
• acinko-rh
• akri3i
• albarker-rh
• dalia-frank
• dshchedr
• ema-aka-young
• geetikakay
• hmeir
• josemacassan
• jpeimer
• kgoldbla
• kshvaika
• rlobillo
• rnetser
• sarahbx
• 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.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 82c5b7c8-3c8b-43b3-b683-cc43281876bc

📥 Commits

Reviewing files that changed from the base of the PR and between 36bafb8 and 98aa1da.

📒 Files selected for processing (14)

• conftest.py
• docs/MULTIARCH.md
• tests/chaos/oadp/test_oadp.py
• tests/conftest.py
• tests/install_upgrade_operators/hco_enablement_golden_image_updates/multiarch/test_multiarch_golden_images_support.py
• tests/storage/cdi_upload/test_upload.py
• tests/storage/cdi_upload/test_upload_virtctl.py
• tests/storage/golden_image/test_golden_image.py
• tests/virt/node/high_performance_vm/test_high_performance_templates.py
• tox.ini
• utilities/architecture.py
• utilities/pytest_utils.py
• utilities/unittests/test_architecture.py
• utilities/unittests/test_pytest_utils.py

🔗 Linked repositories identified

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

• RedHatQE/openshift-virtualization-tests-design-docs (manual)

---

📝 Walkthrough

Walkthrough

This PR adds multiarch pytest filtering and collection wiring, updates cluster architecture handling for comma-separated values, changes architecture-aware fixtures, adds multiarch collection checks and documentation, marks a test module, and switches several tests to safer .get() access.

Changes

Multiarch Test Collection and Architecture Filtering

Layer / File(s)	Summary
Multiarch filtering helpers and tests utilities/pytest_utils.py, utilities/unittests/test_pytest_utils.py	Adds remove_tests_from_list and filter_multiarch_tests for keyword-based deselection, with tests covering multiarch pass-through, deselection, and empty inputs.
Collection hook wiring and arch parsing conftest.py, utilities/architecture.py, utilities/unittests/test_architecture.py	Wires multiarch filtering into pytest_collection_modifyitems and splits OPENSHIFT_VIRTUALIZATION_TEST_IMAGES_ARCH into a set of architectures, with a unit test for comma-separated values.
Architecture-aware node and cluster fixtures tests/conftest.py	Updates schedulable_nodes to filter by KUBERNETES_ARCH_LABEL, removes the unused architecture parameter from cluster_info, and formats cluster architecture output as a joined string.
Multiarch test module marking tests/install_upgrade_operators/hco_enablement_golden_image_updates/multiarch/test_multiarch_golden_images_support.py	Applies pytest.mark.multiarch at module level and disables one inner test class from collection.
Tox multiarch collection checks and docs tox.ini, docs/MULTIARCH.md	Adds a tox environment for per-architecture and combined multiarch collection runs and rewrites the multiarch guide for cluster types, regression runs, dedicated runs, and framework constraints.
Safer optional-key access in tests tests/chaos/oadp/test_oadp.py, tests/storage/cdi_upload/test_upload.py, tests/storage/cdi_upload/test_upload_virtctl.py, tests/storage/golden_image/test_golden_image.py, tests/virt/node/high_performance_vm/test_high_performance_templates.py	Changes several parametrizations and constants from direct indexing to .get() for RHEL image and CPU architecture values.

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

Possibly related issues

• Manual Cherry-pick: [4.22] Add support for multiarch dedicated tests (#5124) - 5565 #5566: The PR adds multiarch test selection, marking, and dedicated-test support aligned with this issue’s objective.

Possibly related PRs

• RedHatQE/openshift-virtualization-tests#4856: Both PRs change tests/conftest.py to filter schedulable_nodes by KUBERNETES_ARCH_LABEL.
• RedHatQE/openshift-virtualization-tests#5124: Strong overlap on multiarch collection filtering and utilities/pytest_utils.py helper additions.
• RedHatQE/openshift-virtualization-tests#5285: Both touch multiarch fixture wiring and collection-time architecture handling.

Suggested labels: new-tests

Suggested reviewers: rnetser, vsibirsk, RoniKishner, dshchedr, EdDev, orelmisan, Anatw, frenzyfriday, azhivovk

---

Caution

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

• Ignore

❌ Failed checks (2 errors)

Check name	Status	Explanation	Resolution
Description check	❌ Error	Required template sections are present, but the key fields are empty or too vague, so it does not satisfy the PR description template.	Fill in what this PR does, the issues fixed, reviewer notes, and jira-ticket (full URL or NONE) with concrete details.
Stp Link Required	❌ Error	HIGH: newly added tests in utilities/unittests/test_architecture.py and test_pytest_utils.py lack any STP/RFE/Jira URL in module/class/function docstrings.	Add an STP/RFE/Jira URL to each new test file’s module docstring, or to the enclosing class/test docstring for every newly added test block.

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title is under 120 characters and clearly states this is a multiarch dedicated tests backport.
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.

✨ 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

• X
• Mastodon
• Reddit
• LinkedIn

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

[hmeir]

/build-and-push-container

[openshift-virtualization-qe-bot-4]

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-5565 published

[hmeir]

/verified

[openshift-virtualization-qe-bot-3]

@coderabbitai

Test execution plan request details

CRITICAL: You MUST post an inline review comment on the first changed line of the first file.
The inline comment should contain the full Test Execution Plan (smoke decision, gating decision, and specific affected tests).
Do NOT submit a blocking review event (REQUEST_CHANGES/APPROVE).
Post a single inline PR comment on Files Changed (non-blocking COMMENT flow).

As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan.
You will post an inline review comment with the test execution plan on the first changed file.
If you fail to run or post a comment, retry.

Analysis Requirements:

1. Examine code changes in each modified file

2. Identify affected code paths, functions, and classes

3. Analyze pytest-specific elements: fixtures (scope, dependencies), parametrization, markers, conftest changes

4. Trace test dependencies through imports, shared utilities, fixture inheritance, fixture teardown, and yield from cleanup in conftest

5. Detect new tests introduced in the PR

6. Utilities and libs impact (when utilities/ or libs/ changes):
   You MUST use shell scripts (rg, git diff) to trace the full impact.
   Follow these sub-steps in order:

   6a. Identify modified symbols: For each changed file under utilities/ or libs/,
   list every modified function or method.
   Example: git diff HEAD~1 --unified=0 -- utilities/hco.py | grep '^[+-]def '

   6b. Find direct callers: Search tests and conftest for each symbol from 6a.
   Example: rg -l 'get_hco_version' tests/

   6c. Trace fixture teardown and cleanup: Find fixtures that reach
   the modified symbol through yield from or context-manager wrappers.
   Example: rg -l 'yield from.*enable_common_boot|def.*enable_common_boot' tests/

   6d. Trace same-file callers: In each changed file, find other functions
   whose body calls a modified symbol (including code after yield
   in @contextmanager helpers).
   Example: rg 'get_hco_version|enable_common_boot' utilities/hco.py

   6e. Expand transitively: If function A calls modified B, then
   tests/fixtures that call A are affected — even when the test body
   never imports B directly.

   Do NOT limit impact to tests that import the modified symbol only.

7. Smoke test impact: Intersect the affected set from step 6 with smoke-marked tests.
   Run: rg -l '@pytest.mark.smoke' tests/
   VERIFY the above command returned actual file paths before concluding False.
   Set True if either condition is met:

   • a smoke-marked file appears in the affected set from 6b-6e, OR
   • any conftest.py in the smoke test's parent-directory hierarchy (up to repo root)
     imports or calls a modified utilities/libs symbol — including autouse fixtures
     that depend on modified functions. ALL tests in that directory and below are affected.
     Example check: for each smoke_file, scan dirname(smoke_file)/conftest.py,
     dirname(dirname(smoke_file))/conftest.py, etc. for modified symbol imports
     and autouse fixtures that depend on modified symbols.

8. Gating test impact: Intersect the affected set from step 6 with gating-marked tests.
   Run: rg -l '@pytest.mark.gating' tests/
   Set True if a gating-marked file also appears in the affected set from 6b-6e.
   Utilities/libs changes often affect gating tests without affecting smoke tests.
   Do NOT stop analysis after concluding Run smoke tests: False.

Output rules:
Do NOT include analysis step numbers (1-8) in your visible output.

Your deliverable:
Your inline informational comment will be based on the following requirements:

Test Execution Plan

• Run smoke tests: True / False — If True, state the dependency path (test → fixture → changed symbol). True ONLY with a verified path.
• Run gating tests: True / False — If True, state the dependency path. True if any gating-marked test is in the affected set.
• Affected tests to run (required when utilities/, libs/, or shared conftest changes — list concrete paths even when smoke is False)

Use these formats:

• path/to/test_file.py - When the entire test file needs verification
• path/to/test_file.py::TestClass::test_method - When specific test(s) needed
• path/to/test_file.py::test_function - When specific test(s) needed
• -m marker - When a marker covers multiple affected tests (e.g. -m gating only if ALL gating tests in scope need run)
• Tag each listed test or group with its marker when not obvious, e.g. (gating) or (smoke)

Real test commands (MANDATORY when changes affect session/runtime code):

When the affected code runs at session/collection time (conftest fixtures, pytest plugins,
config hooks, session-scoped setup) or modifies runtime behavior that unit tests mock away,
you MUST include concrete pytest commands the PR author must run on a real cluster
to verify the change works end-to-end. Include:

• A command for the error/fix path (the scenario the PR fixes)
• A command for the happy path (regression: the normal case still works)
• Use lightweight tests (e.g., --collect-only for startup failures,
  a single small test for runtime behavior)
  If the PR only changes test logic (not utilities/libs/conftest), the affected test
  paths themselves serve as the real test commands — no separate section needed.

Example output for a session-startup fix:

**Real tests (cluster required)**
Error path (the fix):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=nonexistent-sc --collect-only`
Expected: ValueError with clear message, not IndexError

Happy path (regression):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=<valid-sc> -k test_bar`
Expected: session starts normally

Guidelines:

• Include tests affected directly OR via fixture setup/teardown, yield from cleanup, or transitive utility call chains (caller calls modified helper)
• Use a full file path only if ALL tests in that file require verification
• Use file path + test name when only specific tests use an affected fixture or utility wrapper (preferred for partial file impact)
• If a test marker can cover multiple files/tests, provide the marker
• Balance coverage vs over-testing - Keep descriptions minimal
• Example: if leaf helper foo() changes, include tests whose fixture teardown calls wrapper bar() where bar() calls foo(), even when the test body only imports an unrelated symbol from the same utilities module

Hardware-Related Checks (SR-IOV, GPU, DPDK):

When PR modifies fixtures for hardware-specific resources:

• Collection Safety: Fixtures MUST have existence checks (return None when hardware unavailable)
• Test Plan: MUST verify both WITH and WITHOUT hardware:
  • Run affected tests on cluster WITH hardware
  • Verify collection succeeds on cluster WITHOUT hardware

CRITICAL WORKFLOW COMPLETION RULES:

When responding to this test execution plan request, you MUST follow these rules EXACTLY:

1. YOUR ONLY DELIVERABLE: Post one non-blocking inline comment containing the test execution plan on the first changed line
2. THEN STOP IMMEDIATELY - Do NOT generate any additional response
3. FALLBACK ONLY: If inline comment API calls fail after retrying, post as a regular PR comment
4. SILENCE = SUCCESS: After successfully submitting the review, your task is complete. No confirmation needed.

ABSOLUTE PROHIBITIONS (violating these creates empty/meaningless reviews):

• ❌ Do NOT post acknowledgment messages like "Test execution plan posted", "Review posted successfully", "I've successfully posted"
• ❌ Do NOT mention review IDs, URLs, or confirmation of posting in the PR thread
• ❌ Do NOT add any follow-up comments after submitting the review
• ❌ Do NOT reply to confirm task completion
• ❌ Do NOT explain what you did - just do it and stop

Remember: The pull request review is visible to users. Additional comments are redundant noise.

CRITICAL — Verification rules for smoke and gating decisions:
- For each True decision, you must have traced a concrete path: test file → fixture → utility function → modified symbol.
- Do NOT assume impact based on scope, file proximity, or infrastructure-sounding names.
Only set True when you trace a concrete path through steps 6a-6e, then 7 or 8.
WRONG: "utilities/hco.py changed → run smoke" (no traced dependency path)
WRONG: "Run smoke tests: False" with no affected-test list when gating tests use the changed utility
RIGHT: "Run smoke tests: False, Run gating tests: True" plus tests/.../test_foo.py::TestBar::test_baz (gating)
RIGHT: "Smoke test X uses fixture Y → wrapper Z → changed function W in utilities/hco.py"

[coderabbitai]

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail
echo "=== repo check ==="
git rev-parse --abbrev-ref HEAD || true
echo "=== find schedulable_nodes callers ==="
rg -n 'schedulable_nodes' tests/ utilities/ --type py -C1 | head -100
echo "=== find get_cluster_architecture callers ==="
rg -n 'get_cluster_architecture' tests/ utilities/ --type py
echo "=== smoke marked files ==="
rg -l '`@pytest.mark.smoke`' tests/ | head -50
echo "=== gating marked files ==="
rg -l '`@pytest.mark.gating`' tests/ | head -50
echo "=== filter_multiarch_tests usage ==="
rg -n 'filter_multiarch_tests|remove_tests_from_list' --type py

Length of output: 16689

---

@openshift-virtualization-qe-bot-3, repository access worked this time, so here's the grounded Test Execution Plan (posted visibly, per the transparency policy stated in my earlier reply on this PR — I don't post silent/covert reviews):

Test Execution Plan

• Run smoke tests: True — tests/storage/cdi_upload/test_upload_virtctl.py is marked @pytest.mark.smoke (and @pytest.mark.gating), was directly edited in this PR (RHEL image params switched to RHEL_LATEST.get(...)), and also directly consumes the schedulable_nodes fixture whose signature changed in tests/conftest.py (added nodes_cpu_architecture param, now filters by KUBERNETES_ARCH_LABEL).
• Run gating tests: True — Direct edits in gating-marked files:
  • tests/storage/cdi_upload/test_upload_virtctl.py (smoke+gating)
  • tests/storage/golden_image/test_golden_image.py::LATEST_RHEL_IMAGE/RHEL_IMAGE_SIZE module constants → RHEL_LATEST.get(...)
  • tests/virt/node/high_performance_vm/test_high_performance_templates.py → py_config.get("cpu_arch") in both RHEL and Windows parametrize blocks

Affected tests to run

• tests/storage/cdi_upload/test_upload_virtctl.py (smoke, gating)
• tests/storage/golden_image/test_golden_image.py (gating)
• tests/virt/node/high_performance_vm/test_high_performance_templates.py (gating)
• tests/storage/cdi_upload/test_upload.py (direct edit)
• tests/chaos/oadp/test_oadp.py (direct edit)
• tests/install_upgrade_operators/hco_enablement_golden_image_updates/multiarch/test_multiarch_golden_images_support.py (direct edit — pytestmark = [pytest.mark.multiarch] added, disabled class now has __test__ = False)
• utilities/unittests/test_pytest_utils.py, utilities/unittests/test_architecture.py (new/updated unit tests covering filter_multiarch_tests, remove_tests_from_list, get_cluster_architecture)

Real tests (cluster required) — conftest.py's pytest_collection_modifyitems now runs filter_multiarch_tests at collection time, and tests/conftest.py's schedulable_nodes/cluster_info fixtures changed (session-scoped, arch-filtering logic):

Error/fix path (multiarch deselection on homogeneous cluster):
pytest -m multiarch --collect-only
Expected: multiarch-marked tests are deselected via pytest_deselected hook, no collection errors, non-multiarch tests still collected.

Happy path (regression on multiarch/heterogeneous cluster, or default single-arch):
pytest tests/storage/cdi_upload/test_upload_virtctl.py --collect-only
Expected: normal collection succeeds; schedulable_nodes fixture resolves without the removed cpu_arch/py_config coupling.

---

✏️ Learnings added

Learnt from: openshift-virtualization-qe-bot-3
URL: https://github.com/RedHatQE/openshift-virtualization-tests/pull/5565

Timestamp: 2026-07-09T14:37:17.306Z
Learning: In RedHatQE/openshift-virtualization-tests, utilities/pytest_utils.py contains filter_multiarch_tests(items, config) which deselects pytest.mark.multiarch-marked tests when cluster_type != MULTIARCH, and remove_tests_from_list(items, filter_str) which splits items into discard/keep lists by keyword. These are wired into the root conftest.py's pytest_collection_modifyitems hook (after filter_sno_only_tests, before mark_nmstate_dependent_tests) and are not directly imported/used elsewhere in tests/.

---

Learnt from: openshift-virtualization-qe-bot-3
URL: https://github.com/RedHatQE/openshift-virtualization-tests/pull/5565

Timestamp: 2026-07-09T14:37:17.306Z
Learning: In RedHatQE/openshift-virtualization-tests, tests/conftest.py's schedulable_nodes fixture signature changed to schedulable_nodes(nodes, nodes_cpu_architecture) — it now filters nodes by the KUBERNETES_ARCH_LABEL node label instead of relying on py_config['cpu_arch']. The cluster_info fixture had nodes_cpu_architecture removed from its params and now joins py_config['cluster_arch'] as a comma-separated string for logging.

Note: Learnings are effective only in the context of similar code segments. To apply general coding guidelines, please configure review instructions. You can manage existing learnings in the app.

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[OhadRevah]

/lgtm

[SamAlber]

/lgtm

[openshift-virtualization-qe-bot-3]

/retest all

Auto-triggered: Files in this PR were modified by merged PR #5596.

Overlapping files

tests/conftest.py

[rnetser]

/approve
/lgtm

addressed

[openshift-virtualization-qe-bot-2]

Successfully removed PR tag: quay.io/openshift-cnv/openshift-virtualization-tests:pr-5565.

[openshift-virtualization-qe-bot-2]

New container for quay.io/openshift-cnv/openshift-virtualization-tests:cnv-4.22 published