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-5290: [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics #172

Merged

Conversation

aneeshkp
Copy link
Member

@aneeshkp aneeshkp commented Jan 3, 2023

Signed-off-by: Aneesh Puttur aneeshputtur@gmail.com

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2023

@aneeshkp: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

Fix CLOCK_REALTIME going to HOLDOVER in metrics

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
Member Author

aneeshkp commented Jan 3, 2023

/jira cherrypick OCPBUGS-4195

@openshift-ci-robot
Copy link

@aneeshkp: Failed to create a cherry-pick bug in Jira: No Jira issue with key OCPBUGS-4195 exists in the tracker at https://issues.redhat.com/.
Once a valid bug is referenced in the title of this pull request, request a bug refresh with /jira refresh.

In response to this:

/jira cherrypick OCPBUGS-4195

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 aneeshkp changed the title Fix CLOCK_REALTIME going to HOLDOVER in metrics [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics Jan 3, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2023

@aneeshkp: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics

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 aneeshkp force-pushed the multi-cherry-pick branch 2 times, most recently from 68afde8 to 4d84cbb Compare January 3, 2023 17:09
@aneeshkp
Copy link
Member Author

aneeshkp commented Jan 3, 2023

/jira refresh

@openshift-ci-robot
Copy link

@aneeshkp: No Jira bug is referenced in the title of this pull request.
To reference a bug, add 'OCPBUGS-XXX:' to the title of this pull request and request another bug refresh with /jira refresh.

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

@aneeshkp
Copy link
Member Author

aneeshkp commented Jan 3, 2023

/jira cherrypick OCPBUGS-4195

@openshift-ci-robot
Copy link

@aneeshkp: Jira Issue OCPBUGS-4195 has been cloned as Jira Issue OCPBUGS-5290. Retitling PR to link against new bug.
/retitle OCPBUGS-5290: [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics

In response to this:

/jira cherrypick OCPBUGS-4195

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 changed the title [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics OCPBUGS-5290: [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics Jan 3, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2023

@aneeshkp: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-5290: [release-4.11] Fix CLOCK_REALTIME going to HOLDOVER in metrics

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

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

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

Requesting review from QA contact:
/cc @gsr-shanks

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

In response to this:

Signed-off-by: Aneesh Puttur aneeshputtur@gmail.com

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

openshift-ci bot commented Jan 3, 2023

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: gsr-shanks.

Note that only redhat-cne members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

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

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

Requesting review from QA contact:
/cc @gsr-shanks

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

In response to this:

Signed-off-by: Aneesh Puttur aneeshputtur@gmail.com

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.

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 <aneeshputtur@gmail.com>
Copy link
Member

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

openshift-ci bot commented Jan 3, 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-merge-robot openshift-merge-robot merged commit 43c5814 into redhat-cne:release-4.11 Jan 3, 2023
@openshift-ci-robot
Copy link

@aneeshkp: All pull requests linked via external trackers have merged:

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

In response to this:

Signed-off-by: Aneesh Puttur aneeshputtur@gmail.com

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
Member Author

/cherry-pick release-4.10

@openshift-cherrypick-robot

@aneeshkp: #172 failed to apply on top of branch "release-4.10":

Applying: Fix CLOCK_REALTIME going to HOLDOVER in metrics
.git/rebase-apply/patch:55: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	.golangci.yaml
M	cmd/main.go
M	plugins/ptp_operator/metrics/metrics.go
A	plugins/ptp_operator/metrics/ptp4lParse.go
M	plugins/ptp_operator/stats/stats.go
Falling back to patching base and 3-way merge...
Auto-merging plugins/ptp_operator/stats/stats.go
CONFLICT (content): Merge conflict in plugins/ptp_operator/stats/stats.go
CONFLICT (modify/delete): plugins/ptp_operator/metrics/ptp4lParse.go deleted in HEAD and modified in Fix CLOCK_REALTIME going to HOLDOVER in metrics. Version Fix CLOCK_REALTIME going to HOLDOVER in metrics of plugins/ptp_operator/metrics/ptp4lParse.go left in tree.
Auto-merging plugins/ptp_operator/metrics/metrics.go
CONFLICT (content): Merge conflict in plugins/ptp_operator/metrics/metrics.go
Auto-merging cmd/main.go
CONFLICT (content): Merge conflict in cmd/main.go
CONFLICT (modify/delete): .golangci.yaml deleted in HEAD and modified in Fix CLOCK_REALTIME going to HOLDOVER in metrics. Version Fix CLOCK_REALTIME going to HOLDOVER in metrics of .golangci.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix CLOCK_REALTIME going to HOLDOVER in metrics
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.10

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants