🚨 Cherry-pick Conflicts: [Chaos][OADP] Automate Polarion TC CNV-12020: Drain the node where the VM is located during OADP Backup (PR #1820) #2067
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The automatic cherry-pick of PR #1820 from
qwang1/openshift-virtualization-tests
resulted in conflicts.Original PR: [Chaos][OADP] Automate Polarion TC CNV-12020: Drain the node where the VM is located during OADP Backup
Author: @qwang1
Merge Commit: 1e18fc7
🔧 How to resolve:
git fetch origin && git checkout cherry-pick-pr-1820-17726271826-conflicts
git add . && git commit
git push origin cherry-pick-pr-1820-17726271826-conflicts
📁 Files with conflicts:
Original PR Link: #1820
Original Commit: 1e18fc7
Original PR Description
Short description:
It needs #1678 as its dependence.
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