Skip to content

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

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-ocm-2.10from
openshift-cherrypick-robot:cherry-pick-6662-to-release-ocm-2.10
Aug 12, 2024
Merged

openshift-merge-bot[bot] merged 1 commit into
openshift:release-ocm-2.10from
openshift-cherrypick-robot:cherry-pick-6662-to-release-ocm-2.10

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #6662

/assign CrystalChun

/cherrypick release-ocm-2.9

AutomatedCleaningMode should not be used when the
converged flow is disabled since it requires IPA
which is only enabled when the converged flow is enabled.

Caused by regression in PR
openshift#5319
which relies on users to set the automatedCleaningMode
spec, but did not take into account the converged flow
being disabled.
@openshift-ci-robot

openshift-ci-robot commented Aug 12, 2024 •

Copy link
Copy Markdown

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

Details

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. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 12, 2024
@openshift-ci
openshift-ci Bot requested review from oourfali and romfreiman August 12, 2024 19:12
@CrystalChun

CrystalChun commented Aug 12, 2024 •

Copy link
Copy Markdown
Contributor

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

@openshift-ci openshift-ci Bot changed the title [release-ocm-2.10] MGMT-18560: Fix AutomatedCleaningMode behavior [release-ocm-2.10] MGMT-18584: Fix AutomatedCleaningMode behavior Aug 12, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 12, 2024
@openshift-ci-robot

openshift-ci-robot commented Aug 12, 2024 •

Copy link
Copy Markdown

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

Details

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. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@CrystalChun

Copy link
Copy Markdown
Contributor

/uncc @oourfali @romfreiman
/cc @gamli75

@openshift-ci
openshift-ci Bot requested review from gamli75 and removed request for oourfali and romfreiman August 12, 2024 19:13
@codecov

codecov Bot commented Aug 12, 2024 •

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

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

Additional details and impacted files

Impacted file tree graph

@@                 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 Coverage Δ
...nal/controller/controllers/bmh_agent_controller.go 76.48% <100.00%> (+0.07%) ⬆️

... and 2 files with indirect coverage changes

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2024
@openshift-ci

openshift-ci Bot commented Aug 12, 2024

Copy link
Copy Markdown
Contributor

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2024
@openshift-ci

openshift-ci Bot commented Aug 12, 2024

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit b9e318e into openshift:release-ocm-2.10 Aug 12, 2024
@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@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".

Details

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. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants