Closed andyzhangx closed 2 weeks 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
/retest
@andyzhangx: The following test 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-e2e-capz-windows-2022 | 274d0f9cd583ab31ecaabb466f9a0d35f0a91f30 | link | true | /test pull-azuredisk-csi-driver-e2e-capz-windows-2022 |
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.
/retest
/cherrypick release-1.31
/cherrypick release-1.30
/cherrypick release-1.29
@andyzhangx: new pull request created: #2626
@andyzhangx: #2624 failed to apply on top of branch "release-1.30":
Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
@andyzhangx: #2624 failed to apply on top of branch "release-1.29":
Applying: fix: tagValueDelimiter mismatch
Using index info to reconstruct a base tree...
M pkg/azureconstants/azure_constants.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azureconstants/azure_constants.go
CONFLICT (content): Merge conflict in pkg/azureconstants/azure_constants.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 fix: tagValueDelimiter mismatch
/cherrypick release-1.30
/cherrypick release-1.29
@andyzhangx: new pull request created: #2627
@andyzhangx: #2624 failed to apply on top of branch "release-1.29":
Applying: fix: tagValueDelimiter mismatch
Using index info to reconstruct a base tree...
M pkg/azureconstants/azure_constants.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azureconstants/azure_constants.go
CONFLICT (content): Merge conflict in pkg/azureconstants/azure_constants.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 fix: tagValueDelimiter mismatch
/cherrypick release-1.29
@andyzhangx: #2624 failed to apply on top of branch "release-1.29":
Applying: fix: tagValueDelimiter mismatch
Using index info to reconstruct a base tree...
M pkg/azureconstants/azure_constants.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azureconstants/azure_constants.go
CONFLICT (content): Merge conflict in pkg/azureconstants/azure_constants.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 fix: tagValueDelimiter mismatch
What type of PR is this? /kind bug
What this PR does / why we need it: fix: tagValueDelimiter parameter mismatch
Which issue(s) this PR fixes:
Fixes #2323
Requirements:
Special notes for your reviewer:
Release note: