Closed openshift-cherrypick-robot closed 1 month ago
@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: MGMT-18560
/retitle [release-ocm-2.10] MGMT-18584: Fix AutomatedCleaningMode behavior
@openshift-cherrypick-robot: This pull request references MGMT-18584 which is a valid jira issue.
/uncc @oourfali @romfreiman /cc @gamli75
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 68.30%. Comparing base (
a26367d
) to head (35d1010
).
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: gamli75, openshift-cherrypick-robot
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@openshift-cherrypick-robot: all tests passed!
Full PR test history. Your PR dashboard.
@openshift-cherrypick-robot: #6668 failed to apply on top of branch "release-ocm-2.9":
Applying: MGMT-18560: Fix AutomatedCleaningMode behavior
Using index info to reconstruct a base tree...
M internal/controller/controllers/bmh_agent_controller.go
M internal/controller/controllers/bmh_agent_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controller/controllers/bmh_agent_controller_test.go
CONFLICT (content): Merge conflict in internal/controller/controllers/bmh_agent_controller_test.go
Auto-merging internal/controller/controllers/bmh_agent_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-18560: Fix AutomatedCleaningMode behavior
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 #6662
/assign CrystalChun
/cherrypick release-ocm-2.9