Closed andyzhangx closed 1 month ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: andyzhangx
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherrypick release-1.30
/cherrypick release-1.29
/cherrypick release-1.28
@andyzhangx: #2552 failed to apply on top of branch "release-1.29":
Applying: test: run windows ut with host process enabled
Using index info to reconstruct a base tree...
M pkg/azuredisk/fake_azuredisk.go
M pkg/azuredisk/fake_azuredisk_v2.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/fake_azuredisk_v2.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk_v2.go
Auto-merging pkg/azuredisk/fake_azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 test: run windows ut with host process enabled
@andyzhangx: new pull request created: #2553
@andyzhangx: #2552 failed to apply on top of branch "release-1.28":
Applying: test: run windows ut with host process enabled
Using index info to reconstruct a base tree...
M pkg/azuredisk/fake_azuredisk.go
M pkg/azuredisk/fake_azuredisk_v2.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azuredisk/fake_azuredisk_v2.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk_v2.go
Auto-merging pkg/azuredisk/fake_azuredisk.go
CONFLICT (content): Merge conflict in pkg/azuredisk/fake_azuredisk.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 test: run windows ut with host process enabled
What type of PR is this? /kind test
What this PR does / why we need it: test: run windows ut with host process enabled
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: