Skip to content

[4.22] [CCLM] Add cross-storage cross-cluster migration tests + STDs#5601

Merged
rnetser merged 7 commits into
RedHatQE:cnv-4.22from
jpeimer:422_cclm_cross_storage
Jul 13, 2026
Merged

[4.22] [CCLM] Add cross-storage cross-cluster migration tests + STDs#5601
rnetser merged 7 commits into
RedHatQE:cnv-4.22from
jpeimer:422_cclm_cross_storage

Conversation

@jpeimer

@jpeimer jpeimer commented Jul 13, 2026

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

Manual cherry-pick of #4650 and #5480

  1. Cross-storage CCLM support (PR [CCLM] Add cross-storage cross-cluster migration tests #4650)
  • conftest.py — Adds remote_cluster_source_storage_class, local_cluster_target_storage_class fixtures and wires them into local_cluster_mtv_storage_map and VM fixtures instead of hardcoding py_config["default_storage_class"].
  • test_cclm.py — Adds TestCCLMFromStorageAtoB class that migrates from STORAGE_CLASS_A to STORAGE_CLASS_B. Existing test classes updated to parametrize storage classes (both use STORAGE_CLASS_B for same-storage).
  • Shared code moved — STORAGE_CLASS_A/B, NO_STORAGE_CLASS_FAILURE_MESSAGE, and get_storage_class_for_storage_migration moved from storage_migration/ to shared storage/constants.py
    and storage/utils.py for reuse by CCLM.
  1. STD docstrings (PR [Storage] Add STD docstrings to CCLM tests #5480)
  • All tests now have proper STD docstrings.
  1. Conflict resolution fix (our change)
  • utils.py — verify_compute_live_migration_after_cclm now accepts client: DynamicClient and passes it to migrate_vm_and_verify. This was needed because the upstream PRs added the client parameter at the call sites but the function signature didn't have it on this branch.
  • test_cclm.py — Added TYPE_CHECKING imports for DynamicClient and VirtualMachineForTests used in the type hints.
Which issue(s) this PR fixes:
Special notes for reviewer:
jira-ticket:

jpeimer added 7 commits July 13, 2026 08:33
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
- Add type hints to remote_cluster_storage_classes_names fixture
- Add type hints to remote_cluster_source_storage_class fixture
- Add type hints to local_cluster_target_storage_class fixture
- Add docstring to get_storage_class_for_storage_migration()
- Add docstrings to all three new fixtures
- Fix line length in local_cluster_target_storage_class
- Remove unused constant TESTS_CLASS_NAME_STORAGE_B_TO_A

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
The Jira link is an epic tracker, not a bug — skip the
verify-bugs-are-open check so it is not flagged as unresolved.

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
Pass DynamicClient through to migrate_vm_and_verify so migrations
use the correct cluster client. Add TYPE_CHECKING imports in
test_cclm.py for the type hints introduced by the STD docstrings PR.

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
@coderabbitai

coderabbitai Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (5)
  • main
  • cnv-4.21
  • cnv-4.20
  • cnv-4.19
  • cnv-4.18

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: ae738248-a259-4cbe-ac26-269d0d92599f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ 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

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:

  • jpeimer

Reviewers:

  • Ahmad-Hafe
  • acinko-rh
  • dalia-frank
  • ema-aka-young
  • josemacassan
  • jpeimer
  • kgoldbla
  • kshvaika
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.

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

D/S test tox -e verify-tc-requirement-polarion failed: cnv-tests-tox-executor/30323

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

D/S test tox -e verify-tc-requirement-polarion failed: cnv-tests-tox-executor/30328

Comment thread tests/storage/cross_cluster_live_migration/conftest.py
@josemacassan

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

D/S test tox -e verify-tc-requirement-polarion failed: cnv-tests-tox-executor/30358

@jpeimer

jpeimer commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Hi @rnetser , polarion check is failing consistently for this PR with

12:37:49    File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
12:37:49      raise HTTPError(req.full_url, code, msg, hdrs, fp)
12:37:49  urllib.error.HTTPError: HTTP Error 503: Service Unavailable
...
12:37:49      raise TransportError(str(e), e.code, e.fp)
12:37:49  suds.transport.TransportError: HTTP Error 503: Service Unavailable

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

D/S test tox -e verify-tc-requirement-polarion failed: cnv-tests-tox-executor/30374

@rnetser

rnetser commented Jul 13, 2026

Copy link
Copy Markdown
Collaborator

Hi @rnetser , polarion check is failing consistently for this PR with

12:37:49    File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
12:37:49      raise HTTPError(req.full_url, code, msg, hdrs, fp)
12:37:49  urllib.error.HTTPError: HTTP Error 503: Service Unavailable
...
12:37:49      raise TransportError(str(e), e.code, e.fp)
12:37:49  suds.transport.TransportError: HTTP Error 503: Service Unavailable

something on polarion side; passed now

@rnetser

rnetser commented Jul 13, 2026

Copy link
Copy Markdown
Collaborator

/approve
/lgtm

@rnetser
rnetser merged commit 7af4cd4 into RedHatQE:cnv-4.22 Jul 13, 2026
47 checks passed
@openshift-virtualization-qe-bot-6

Copy link
Copy Markdown

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

@openshift-virtualization-qe-bot-6

Copy link
Copy Markdown

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

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