Closed openshift-cherrypick-robot closed 1 year ago
@openshift-cherrypick-robot: all tests passed!
Full PR test history. Your PR dashboard.
one more lgtm from someone else please :D
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: kaovilai, openshift-cherrypick-robot, sseago
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick oadp-1.1
@kaovilai: #189 failed to apply on top of branch "oadp-1.1":
Applying: Add annotation to exclude build pod volumes during backup
.git/rebase-apply/patch:423: trailing whitespace.
buildPod = corev1API.Pod{
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M velero-plugins/main.go
Falling back to patching base and 3-way merge...
Auto-merging velero-plugins/main.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add annotation to exclude build pod volumes during backup
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
This is an automated cherry-pick of #171
/assign kaovilai