Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.13] OCPBUGS-30629: Do not update instance_info and deploy_interface for active nodes #337

Merged

Conversation

honza
Copy link
Member

@honza honza commented Mar 8, 2024

Doing so may interfere with cleaning. Updates to deploy_interface will be rejected by Ironic, causing BMO to enter infinite reconcile retries.

(cherry picked from commit e6179d7) (cherry picked from commit 4adb8f0)

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 8, 2024
@openshift-ci-robot
Copy link

@honza: This pull request references Jira Issue OCPBUGS-30629, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24489 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-24489 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jhajyahy@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Doing so may interfere with cleaning. Updates to deploy_interface will be rejected by Ironic, causing BMO to enter infinite reconcile retries.

(cherry picked from commit e6179d7) (cherry picked from commit 4adb8f0)

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.

Copy link

openshift-ci bot commented Mar 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: honza

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:

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 Mar 8, 2024
Doing so may interfere with cleaning. Updates to deploy_interface will
be rejected by Ironic, causing BMO to enter infinite reconcile retries.

(cherry picked from commit e6179d7)
(cherry picked from commit 4adb8f0)
@honza honza force-pushed the backport-4.13-instance-info branch from d3b2ecf to daf234b Compare March 8, 2024 14:15
@iurygregory
Copy link

/test e2e-metal-ipi-serial-ipv4

@jadhaj
Copy link

jadhaj commented Mar 12, 2024

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 12, 2024
@dtantsur
Copy link
Member

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 12, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ecd1733 and 2 for PR HEAD daf234b in total

Copy link

openshift-ci bot commented Mar 12, 2024

@honza: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit f6db335 into openshift:release-4.13 Mar 12, 2024
7 checks passed
@openshift-ci-robot
Copy link

@honza: Jira Issue OCPBUGS-30629: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-30629 has been moved to the MODIFIED state.

In response to this:

Doing so may interfere with cleaning. Updates to deploy_interface will be rejected by Ironic, causing BMO to enter infinite reconcile retries.

(cherry picked from commit e6179d7) (cherry picked from commit 4adb8f0)

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.

@honza
Copy link
Member Author

honza commented Mar 12, 2024

/cherry-pick release-4.12

@openshift-cherrypick-robot

@honza: #337 failed to apply on top of branch "release-4.12":

Applying: Do not update instance_info and deploy_interface for active nodes
Using index info to reconstruct a base tree...
M	pkg/provisioner/ironic/ironic.go
M	pkg/provisioner/ironic/validatemanagementaccess_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provisioner/ironic/validatemanagementaccess_test.go
Auto-merging pkg/provisioner/ironic/ironic.go
CONFLICT (content): Merge conflict in pkg/provisioner/ironic/ironic.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 Do not update instance_info and deploy_interface for active nodes
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:

/cherry-pick release-4.12

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/test-infra repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-baremetal-operator-container-v4.13.0-202403122143.p0.gf6db335.assembly.stream.el8 for distgit ose-baremetal-operator.
All builds following this will include this PR.

@openshift-merge-robot
Copy link

Fix included in accepted release 4.13.0-0.nightly-2024-03-12-214150

@openshift-merge-robot
Copy link

Fix included in accepted release 4.13.0-0.nightly-2024-03-13-081215

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants