Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #96

/assign upalatucci

Signed-off-by: Aviv Turgeman <aturgema@redhat.com>
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-49650 has been cloned as Jira Issue OCPBUGS-54581. Will retitle bug to link to clone.
/retitle [release-4.18] OCPBUGS-54581: fix topology crash

Details

In response to this:

This is an automated cherry-pick of #96

/assign upalatucci

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 changed the title [release-4.18] OCPBUGS-49650: fix topology crash [release-4.18] OCPBUGS-54581: fix topology crash Apr 3, 2025
@upalatucci
Copy link

/lgtm
/approve

@openshift-ci openshift-ci bot requested review from avivtur and yaacov April 3, 2025 10:56
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 3, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-54581, which is invalid:

  • expected dependent Jira Issue OCPBUGS-49650 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

This is an automated cherry-pick of #96

/assign upalatucci

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
Copy link

openshift-ci bot commented Apr 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, upalatucci

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 Apr 3, 2025
@upalatucci
Copy link

/jira refresh

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 3, 2025
@openshift-ci-robot
Copy link

@upalatucci: This pull request references Jira Issue OCPBUGS-54581, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-49650 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-49650 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents
Details

In response to this:

/jira refresh

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
Copy link

openshift-ci bot commented Apr 3, 2025

@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 9f866a2 into openshift:release-4.18 Apr 3, 2025
3 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-54581: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is an automated cherry-pick of #96

/assign upalatucci

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.

@upalatucci
Copy link

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Author

@upalatucci: #98 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-49650: fix topology crash
Using index info to reconstruct a base tree...
A	src/views/states/topology/utils/LevelsLayout.ts
M	src/views/states/topology/utils/utils.ts
Falling back to patching base and 3-way merge...
Auto-merging src/views/states/topology/utils/utils.ts
CONFLICT (content): Merge conflict in src/views/states/topology/utils/utils.ts
CONFLICT (modify/delete): src/views/states/topology/utils/LevelsLayout.ts deleted in HEAD and modified in OCPBUGS-49650: fix topology crash. Version OCPBUGS-49650: fix topology crash of src/views/states/topology/utils/LevelsLayout.ts left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-49650: fix topology crash

Details

In response to this:

/cherry-pick release-4.17

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.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: nmstate-console-plugin
This PR has been included in build nmstate-console-plugin-container-v4.18.0-202504031232.p0.g9f866a2.assembly.stream.el9.
All builds following this will include this PR.

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

5 participants