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.18] OCPBUGS-46635: Fix GM State Transition Event Generation #381

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #380

/assign vitus133

This is a cherrypick from redhat-cne#379
Previously, when the Grandmaster (GM) transitioned to the HOLDOVER state, an event was generated with the HOLDOVER status. However, subsequent state transitions from HOLDOVER to FREERUN or LOCKED did not trigger any events.
This bug fix ensures that events are now correctly generated for transitions from HOLDOVER to FREERUN or LOCKED states.

Signed-off-by: Vitaly Grinberg <[email protected]>
Signed-off-by: Vitaly Grinberg <[email protected]>
Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

Hi @openshift-cherrypick-robot. Thanks for your PR.

I'm waiting for a redhat-cne member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@vitus133
Copy link
Member

/approve
/label backport-risk-assessed

Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

@vitus133: The label(s) backport-risk-assessed cannot be applied, because the repository doesn't have them.

In response to this:

/approve
/label backport-risk-assessed

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.

@vitus133 vitus133 changed the title [release-4.18] OCPBUGS-45866 : Fix GM State Transition Event Generation [release-4.18] Fix GM State Transition Event Generation Dec 19, 2024
@vitus133
Copy link
Member

/label ok-to-test

Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

@vitus133: The label(s) /label ok-to-test cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label ok-to-test

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.

@vitus133 vitus133 changed the title [release-4.18] Fix GM State Transition Event Generation [release-4.18] OCPBUGS-46635: Fix GM State Transition Event Generation Dec 19, 2024
@openshift-ci-robot
Copy link

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

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-46635 to depend on a bug targeting a version in 4.19.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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.

In response to this:

This is an automated cherry-pick of #380

/assign vitus133

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.

@vitus133
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@vitus133: This pull request references Jira Issue OCPBUGS-46635, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

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.

@vitus133
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@vitus133: This pull request references Jira Issue OCPBUGS-46635, 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.0) matches configured target version for branch (4.18.0)
  • 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-45866 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-45866 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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.

Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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

@vitus133 vitus133 merged commit a24a745 into redhat-cne:release-4.18 Dec 19, 2024
4 of 5 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

This is an automated cherry-pick of #380

/assign vitus133

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.

@vitus133
Copy link
Member

/cherrypick release-4.17

@openshift-cherrypick-robot
Copy link
Author

@vitus133: #381 failed to apply on top of branch "release-4.17":

Applying: Fix GM State Transition Event Generation
Using index info to reconstruct a base tree...
M	plugins/ptp_operator/metrics/logparser.go
Falling back to patching base and 3-way merge...
Auto-merging plugins/ptp_operator/metrics/logparser.go
CONFLICT (content): Merge conflict in plugins/ptp_operator/metrics/logparser.go
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 Fix GM State Transition Event Generation

In response to this:

/cherrypick 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
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cloud-event-proxy
This PR has been included in build cloud-event-proxy-container-v4.18.0-202412191338.p0.ga24a745.assembly.stream.el9.
All builds following this will include this PR.

@vitus133
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@vitus133: Jira Issue OCPBUGS-46635 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

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.

@vitus133
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@vitus133: Jira Issue OCPBUGS-46635: All pull requests linked via external trackers have merged:

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

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.

@vitus133
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@vitus133: Jira Issue OCPBUGS-46635 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

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.

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

Successfully merging this pull request may close these issues.

4 participants