openshift / assisted-service

Apache License 2.0
109 stars 209 forks source link

[release-ocm-2.10] MGMT-18584: Fix AutomatedCleaningMode behavior #6668

Closed openshift-cherrypick-robot closed 1 month ago

openshift-cherrypick-robot commented 1 month ago

This is an automated cherry-pick of #6662

/assign CrystalChun

/cherrypick release-ocm-2.9

openshift-ci-robot commented 1 month ago

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: MGMT-18560

In response to [this](https://github.com/openshift/assisted-service/pull/6668): >This is an automated cherry-pick of #6662 > >/assign CrystalChun > >/cherrypick release-ocm-2.9 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-service). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
CrystalChun commented 1 month ago

/retitle [release-ocm-2.10] MGMT-18584: Fix AutomatedCleaningMode behavior

openshift-ci-robot commented 1 month ago

@openshift-cherrypick-robot: This pull request references MGMT-18584 which is a valid jira issue.

In response to [this](https://github.com/openshift/assisted-service/pull/6668): >This is an automated cherry-pick of #6662 > >/assign CrystalChun > >/cherrypick release-ocm-2.9 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fassisted-service). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
CrystalChun commented 1 month ago

/uncc @oourfali @romfreiman /cc @gamli75

codecov[bot] commented 1 month ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 68.30%. Comparing base (a26367d) to head (35d1010).

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/openshift/assisted-service/pull/6668/graphs/tree.svg?width=650&height=150&src=pr&token=YOR4NSSOXQ&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift)](https://app.codecov.io/gh/openshift/assisted-service/pull/6668?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) ```diff @@ Coverage Diff @@ ## release-ocm-2.10 #6668 +/- ## ==================================================== + Coverage 68.29% 68.30% +0.01% ==================================================== Files 236 236 Lines 35093 35096 +3 ==================================================== + Hits 23968 23974 +6 + Misses 9051 9049 -2 + Partials 2074 2073 -1 ``` | [Files](https://app.codecov.io/gh/openshift/assisted-service/pull/6668?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) | Coverage Δ | | |---|---|---| | [...nal/controller/controllers/bmh\_agent\_controller.go](https://app.codecov.io/gh/openshift/assisted-service/pull/6668?src=pr&el=tree&filepath=internal%2Fcontroller%2Fcontrollers%2Fbmh_agent_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-aW50ZXJuYWwvY29udHJvbGxlci9jb250cm9sbGVycy9ibWhfYWdlbnRfY29udHJvbGxlci5nbw==) | `76.48% <100.00%> (+0.07%)` | :arrow_up: | ... and [2 files with indirect coverage changes](https://app.codecov.io/gh/openshift/assisted-service/pull/6668/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift)
openshift-ci[bot] commented 1 month ago

[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

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/assisted-service/blob/release-ocm-2.10/OWNERS)~~ [gamli75] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci[bot] commented 1 month ago

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-cherrypick-robot commented 1 month ago

@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".
In response to [this](): >This is an automated cherry-pick of #6662 > >/assign CrystalChun > >/cherrypick release-ocm-2.9 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.