search

openshift-kni / cnf-features-deploy

Kustomize configs for installing CNF features and e2e functional tests for verifying feature deployment/integration
Apache License 2.0
57 stars 134 forks source link

[release-4.15] OCPBUGS-35759: Update ptpconfig to configure NAV-TIMELS to be periodically sent via the UBX-CFG-MSG message #1943

Closed openshift-cherrypick-robot closed 2 months ago

openshift-cherrypick-robot commented 2 months ago

This is an automated cherry-pick of #1932

/assign aneeshkp

openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-35273 has been cloned as Jira Issue OCPBUGS-35759. Will retitle bug to link to clone. /retitle [release-4.15] OCPBUGS-35759: Update ptpconfig to configure NAV-TIMELS to be periodically sent via the UBX-CFG-MSG message

In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1943): >This is an automated cherry-pick of #1932 > >/assign aneeshkp Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift-kni%2Fcnf-features-deploy). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-35759, 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.15.z) matches configured target version for branch (4.15.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note type set to "Release Note Not Required" * dependent bug [Jira Issue OCPBUGS-35273](https://issues.redhat.com//browse/OCPBUGS-35273) 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-35273](https://issues.redhat.com//browse/OCPBUGS-35273) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

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

In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1943): >This is an automated cherry-pick of #1932 > >/assign aneeshkp Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift-kni%2Fcnf-features-deploy). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
aneeshkp commented 2 months ago

/cherry-pick release-4.14

openshift-cherrypick-robot commented 2 months ago

@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](https://github.com/openshift-kni/cnf-features-deploy/pull/1943#issuecomment-2191570275): >/cherry-pick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jzding, nishant-parekh, openshift-cherrypick-robot

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: - ~~[ztp/OWNERS](https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.15/ztp/OWNERS)~~ [nishant-parekh] 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 commented 2 months ago

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

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

In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1943): >This is an automated cherry-pick of #1932 > >/assign aneeshkp Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift-kni%2Fcnf-features-deploy). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-cherrypick-robot commented 2 months ago

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

Applying: ztp: update ptpconfig to configure NAV-TIMELS
Using index info to reconstruct a base tree...
M   ztp/source-crs/PtpConfigDualCardGmWpc.yaml
M   ztp/source-crs/PtpConfigGmWpc.yaml
Falling back to patching base and 3-way merge...
Auto-merging ztp/source-crs/PtpConfigGmWpc.yaml
CONFLICT (content): Merge conflict in ztp/source-crs/PtpConfigGmWpc.yaml
Auto-merging ztp/source-crs/PtpConfigDualCardGmWpc.yaml
CONFLICT (content): Merge conflict in ztp/source-crs/PtpConfigDualCardGmWpc.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ztp: update ptpconfig to configure NAV-TIMELS
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](https://github.com/openshift-kni/cnf-features-deploy/pull/1943#issuecomment-2191570275): >/cherry-pick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.