Skip to content

CherryPicked: [cnv-4.19] [4.21] Remove DataSource storage class fallback from DV template helper#5358

Merged
rnetser merged 1 commit into
cnv-4.19from
CherryPicked-421-storage-class-fallback-Bs74g
Jun 24, 2026
Merged

CherryPicked: [cnv-4.19] [4.21] Remove DataSource storage class fallback from DV template helper#5358
rnetser merged 1 commit into
cnv-4.19from
CherryPicked-421-storage-class-fallback-Bs74g

Conversation

@cnv-tests-github-webhook-dollierp

@cnv-tests-github-webhook-dollierp cnv-tests-github-webhook-dollierp Bot commented Jun 24, 2026

Copy link
Copy Markdown

Cherry-pick from cnv-4.21 branch, original PR: #5228, PR owner: RoniKishner

@RoniKishner
[4.21] Remove DataSource storage class fallback from DV template help…
126335f 
…er (#5228)

##### What this PR does / why we need it:
When calling `data_volume_template_with_source_ref_dict` we should
either use it with explicit `storage_class` field, or omit the field and
use the default storage class.
Relying on the storage class of the DataSources can cause miss
interpretations, while also causing issues since it is not possible to
match the storage class to the DataSource, if a snap shot storage class
is used.

##### Which issue(s) this PR fixes:
Failing tests when snapshot storage classes are set.

##### Special notes for reviewer:
Cherry-pick from main branch, original PR:
#4985

##### jira-ticket:
<!-- full-ticket-url needs to be provided. This would add a link to the
pull request to the jira and close it when the pull request is merged If
the task is not tracked by a Jira ticket, just write "NONE". -->
https://redhat.atlassian.net/browse/CNV-88988

Signed-off-by: Roni Kishner <rkishner@redhat.com>
Merged
@openshift-virtualization-qe-bot-2

openshift-virtualization-qe-bot-2 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

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
  • RoniKishner
  • acinko-rh
  • dalia-frank
  • dshchedr
  • ema-aka-young
  • geetikakay
  • josemacassan
  • jpeimer
  • kgoldbla
  • kshvaika
  • 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

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

@RoniKishner

RoniKishner commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

/verified

test_vm_from_golden_image_cluster_default_storage_class
test_vm_dv_with_different_sc
gating

@geetikakay

geetikakay commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@rnetser

rnetser commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

/approve
/lgtm

@rnetser rnetser merged commit 227c235 into cnv-4.19 Jun 24, 2026
22 checks passed
@rnetser rnetser deleted the CherryPicked-421-storage-class-fallback-Bs74g branch June 24, 2026 19:24
Open
@openshift-virtualization-qe-bot-3

openshift-virtualization-qe-bot-3 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

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

@RoniKishner

RoniKishner commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick cnv-4.18

@cnv-tests-github-webhook-dollierp cnv-tests-github-webhook-dollierp Bot mentioned this pull request Jun 25, 2026
Merged
@openshift-virtualization-qe-bot-3

openshift-virtualization-qe-bot-3 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick conflicts were resolved by AI

Cherry-picked PR CherryPicked: [cnv-4.19] [4.21] Remove DataSource storage class fallback from DV template helper into cnv-4.18: #5384
Conflicts were automatically resolved by AI (claude/claude-opus-4-6-1m).

@cnv-tests-github-webhook-dollierp[bot] Manual verification is required — please review the changes and test before merging.

dshchedr pushed a commit that referenced this pull request Jun 30, 2026
@cnv-tests-github-webhook-dollierp @RoniKishner
CherryPicked: [cnv-4.18] CherryPicked: [cnv-4.19] [4.21] Remove DataS…
7d4f53e 
…ource storage class fallback from DV template helper (#5384)

Cherry-pick from `cnv-4.19` branch, original PR:
#5358, PR
owner: cnv-tests-github-webhook-dollierp[bot]

Signed-off-by: cnv-tests-github-webhook-dollierp[bot] <rkishner@redhat.com>
Co-authored-by: cnv-tests-github-webhook-dollierp[bot] <rkishner@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RoniKishner RoniKishner Awaiting requested review from RoniKishner
@vsibirsk vsibirsk Awaiting requested review from vsibirsk
@dshchedr dshchedr Awaiting requested review from dshchedr
@jpeimer jpeimer Awaiting requested review from jpeimer
@geetikakay geetikakay Awaiting requested review from geetikakay
@dalia-frank dalia-frank Awaiting requested review from dalia-frank
@rnetser rnetser Awaiting requested review from rnetser
@ema-aka-young ema-aka-young Awaiting requested review from ema-aka-young
@kshvaika kshvaika Awaiting requested review from kshvaika
@acinko-rh acinko-rh Awaiting requested review from acinko-rh
@josemacassan josemacassan Awaiting requested review from josemacassan
@kgoldbla kgoldbla Awaiting requested review from kgoldbla
@Ahmad-Hafe Ahmad-Hafe Awaiting requested review from Ahmad-Hafe

Assignees

@RoniKishner RoniKishner

@cnv-tests-github-webhook-dollierp cnv-tests-github-webhook-dollierp[bot]

Labels

approved-rnetser branch-cnv-4.19 can-be-merged cherry-pick-cnv-4.18 CherryPicked-from-cnv-4.21 lgtm-geetikakay lgtm-rnetser sig-infra sig-storage size/XS tox:verify-tc-requirement-polarion:passed D/S Testing verified

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@openshift-virtualization-qe-bot-2 @RoniKishner @geetikakay @rnetser @openshift-virtualization-qe-bot-3 @openshift-virtualization-qe-bot @openshift-virtualization-qe-bot-4 @openshift-virtualization-qe-bot-6