Closed andyzhangx closed 1 week 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
@andyzhangx: The following tests failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
pull-azuredisk-csi-driver-external-e2e-single-az | 03b74d07da9c8de1ba3b59ce88540a6cfab37bf6 | link | true | /test pull-azuredisk-csi-driver-external-e2e-single-az |
pull-azuredisk-csi-driver-e2e-capz-windows-2019-hostprocess | 03b74d07da9c8de1ba3b59ce88540a6cfab37bf6 | link | true | /test pull-azuredisk-csi-driver-e2e-capz-windows-2019-hostprocess |
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.
/cherrypick release-1.31
/cherrypick release-1.30
/cherrypick release-1.29
@andyzhangx: new pull request created: #2645
@andyzhangx: new pull request created: #2646
@andyzhangx: #2644 failed to apply on top of branch "release-1.29":
Applying: chore: set concurrent-format-timeout as 100s
Using index info to reconstruct a base tree...
A pkg/azuredisk/azuredisk_option.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/azuredisk/azuredisk_option.go deleted in HEAD and modified in chore: set concurrent-format-timeout as 100s. Version chore: set concurrent-format-timeout as 100s of pkg/azuredisk/azuredisk_option.go left in tree.
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 chore: set concurrent-format-timeout as 100s
What type of PR is this? /kind cleanup
What this PR does / why we need it: chore: set concurrent-format-timeout as 100s, proceeding fix of https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2616
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: