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

OCPBUGS-19345: ptp clock does not stay locked in GM configuration when threshold is changed in ptpconfig #213

Merged

Conversation

aneeshkp
Copy link
Contributor

Handle register and unregister of monitoring lifecycle for dpll/gpsd

@openshift-ci-robot openshift-ci-robot added 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 Sep 18, 2023
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (bblock@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:

Handle register and unregister of monitoring lifecycle for dpll/gpsd

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-ci openshift-ci bot requested review from dcbw and dougbtv September 18, 2023 17:57
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2023
@aneeshkp
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@aneeshkp: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Copy link
Contributor

@jzding jzding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 19, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aneeshkp, jzding

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

/retest-required

Remaining retests: 0 against base HEAD f1d4d5d and 2 for PR HEAD 85dd1ff in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 19, 2023

@aneeshkp: 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-robot openshift-merge-robot merged commit 8def37f into openshift:master Sep 19, 2023
5 checks passed
@openshift-ci-robot
Copy link
Contributor

@aneeshkp: Jira Issue OCPBUGS-19345: All pull requests linked via external trackers have merged:

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

In response to this:

Handle register and unregister of monitoring lifecycle for dpll/gpsd

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-cherrypick-robot

@aneeshkp: #213 failed to apply on top of branch "release-4.14":

Applying: Handle register and unregister of monitoring lifecycle for dpll /gpsd
Using index info to reconstruct a base tree...
M	pkg/daemon/gpsd.go
M	pkg/dpll/dpll.go
M	pkg/event/event.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/event/event.go
Auto-merging pkg/dpll/dpll.go
Auto-merging pkg/daemon/gpsd.go
CONFLICT (content): Merge conflict in pkg/daemon/gpsd.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 Handle register and unregister of monitoring lifecycle for dpll /gpsd
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.14

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.

@aneeshkp
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@aneeshkp: new pull request created: #217

In response to this:

/cherry-pick release-4.14

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.

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.

None yet

5 participants