Skip to content

CherryPicked: [cnv-4.22] Add retry for virtctl download to handle transient SSL errors#5570

Merged
rnetser merged 1 commit into
cnv-4.22from
CherryPicked-add-retry-to-virtctl-download-RdTPR
Jul 12, 2026
Merged

CherryPicked: [cnv-4.22] Add retry for virtctl download to handle transient SSL errors#5570
rnetser merged 1 commit into
cnv-4.22from
CherryPicked-add-retry-to-virtctl-download-RdTPR

Conversation

@cnv-tests-github-webhook-dollierp

@cnv-tests-github-webhook-dollierp cnv-tests-github-webhook-dollierp Bot commented Jul 9, 2026

Copy link
Copy Markdown

Cherry-pick from main branch, original PR: #5355, PR owner: Ahmad-Hafe

@Ahmad-Hafe
Add retry for virtctl download to handle transient SSL errors (#5355)
1264e76 
The virtctl binary download from the cluster CLI route can
intermittently fail with transient SSL/connection errors, causing all
tests depending on the `virtctl_binary` fixture to fail in setup.

Wraps the download in a `@retry` decorator that retries on `SSLError`,
`ConnectionError`, and `Timeout` for up to 2 minutes (10s between
attempts).

Tested

* `TestDisconnectedVirtctlDownload::test_download_virtcli_binary`
(gating) - PASSED
*
`TestDisconnectedVirtctlDownloadAndExecute::test_download_and_execute_virtcli_binary_linux`
(gating) - PASSED

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

Co-authored-by: Cursor <cursoragent@cursor.com>

Signed-off-by: Ahmad Hafe <ahafe@redhat.com>
Merged
@openshift-virtualization-qe-bot-3

openshift-virtualization-qe-bot-3 commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

⚠️ This cherry-pick had conflicts resolved by AI (claude/claude-opus-4-6-1m)

@Ahmad-Hafe — AI automatically resolved merge conflicts for this cherry-pick. Please review the changes carefully and verify correctness before merging.

@openshift-virtualization-qe-bot-6

openshift-virtualization-qe-bot-6 commented Jul 9, 2026

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
  • 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.

@Ahmad-Hafe

Ahmad-Hafe commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

/verified

@rnetser

rnetser commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator

/approve
/lgtm

@RoniKishner

RoniKishner commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@rnetser
rnetser merged commit 8ddcc9b into cnv-4.22 Jul 12, 2026
26 checks passed
@rnetser
rnetser deleted the CherryPicked-add-retry-to-virtctl-download-RdTPR branch July 12, 2026 12:06
@openshift-virtualization-qe-bot-6

openshift-virtualization-qe-bot-6 commented Jul 12, 2026

Copy link
Copy Markdown

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

@Ahmad-Hafe

Ahmad-Hafe commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick cnv-4.21

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

openshift-virtualization-qe-bot-3 commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Cherry-picked PR CherryPicked: [cnv-4.22] Add retry for virtctl download to handle transient SSL errors into cnv-4.21: #5608

dshchedr pushed a commit that referenced this pull request Jul 17, 2026
@cnv-tests-github-webhook-dollierp @Ahmad-Hafe
CherryPicked: [cnv-4.21] CherryPicked: [cnv-4.22] Add retry for virtc…
b130df5 
…tl download to handle transient SSL errors (#5608)

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

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

Reviewers

@Ahmad-Hafe Ahmad-Hafe Awaiting requested review from Ahmad-Hafe
@geetikakay geetikakay Awaiting requested review from geetikakay
@vsibirsk vsibirsk Awaiting requested review from vsibirsk
@RoniKishner RoniKishner Awaiting requested review from RoniKishner
@dshchedr dshchedr Awaiting requested review from dshchedr
@rnetser rnetser Awaiting requested review from rnetser

Assignees

@Ahmad-Hafe Ahmad-Hafe

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

Labels

ai-resolved-conflicts approved-rnetser branch-cnv-4.22 can-be-merged cherry-pick-cnv-4.21 CherryPicked-from-main lgtm-rnetser lgtm-RoniKishner needs-rebase size/S 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-3 @openshift-virtualization-qe-bot-6 @Ahmad-Hafe @rnetser @RoniKishner @openshift-virtualization-qe-bot @openshift-virtualization-qe-bot-2 @openshift-virtualization-qe-bot-5