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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-14832 - update PTP ref config #65252

Merged
merged 1 commit into from Sep 28, 2023
Merged

OCPBUGS-14832 - update PTP ref config #65252

merged 1 commit into from Sep 28, 2023

Conversation

aireilly
Copy link
Contributor

@aireilly aireilly commented Sep 26, 2023 •
edited

@openshift-ci openshift-ci bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 26, 2023
@aireilly aireilly force-pushed the OCPBUGS-14832-ptp-ref-config branch 2 times, most recently from 1c6f57f to f1ec074 Compare September 26, 2023 16:48
@aireilly aireilly changed the title OCPBUGS-14832 - udate PTP ref config OCPBUGS-14832 - update PTP ref config Sep 26, 2023
@aireilly aireilly force-pushed the OCPBUGS-14832-ptp-ref-config branch 3 times, most recently from 36d702f to ff4f292 Compare September 26, 2023 16:54
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 26, 2023 •
edited

🤖 Updated build preview is available at:
https://65252--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/26097

@aireilly
Copy link
Contributor Author

@josephdrichard PTAL

@aireilly
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 27, 2023
@dfitzmau
Copy link
Contributor

/remove-label peer-review-needed
/label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 27, 2023
dfitzmau
dfitzmau reviewed Sep 27, 2023
View reviewed changes
Copy link
Contributor

@dfitzmau dfitzmau left a comment

Choose a reason for hiding this comment

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

Hi @aireilly . I do not fully understand the YAML configs but I reviewed the content as best I could. I added some minor comments inline.

/remove-label peer-review-in-progress

/label peer-review-done

modules/nw-ptp-configuring-linuxptp-services-as-boundary-clock.adoc Outdated Show resolved Hide resolved
modules/nw-ptp-configuring-linuxptp-services-as-boundary-clock.adoc Show resolved Hide resolved
snippets/ptp_PtpConfigMaster.yaml Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Sep 27, 2023
@aireilly aireilly force-pushed the OCPBUGS-14832-ptp-ref-config branch 2 times, most recently from 40314ec to 440c631 Compare September 27, 2023 12:38
@aireilly
Copy link
Contributor Author

@Bonnie-Block PTAL at this for a docs QE review when you can please.

@Bonnie-Block
Copy link

lgtm

@josephdrichard
Copy link
Contributor

/lgtm

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

LGTM

@aireilly
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 28, 2023
@jldohmann jldohmann added this to the Continuous Release milestone Sep 28, 2023
@jldohmann jldohmann added the telco Label for all Telco PRs label Sep 28, 2023
jldohmann
jldohmann approved these changes Sep 28, 2023
View reviewed changes
Copy link
Contributor

@jldohmann jldohmann left a comment

Choose a reason for hiding this comment

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

lgtm

@jldohmann jldohmann merged commit 94dd2c5 into openshift:main Sep 28, 2023
1 check passed
@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.14

@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.13

@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.12

@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.11

@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.10

@jldohmann jldohmann removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 28, 2023
@openshift-cherrypick-robot
Copy link

@jldohmann: new pull request created: #65484

In response to this:

/cherrypick enterprise-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.

This was referenced Sep 28, 2023
Merged
Merged
@openshift-cherrypick-robot
Copy link

@jldohmann: new pull request created: #65485

In response to this:

/cherrypick enterprise-4.13

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

@jldohmann: #65252 failed to apply on top of branch "enterprise-4.12":

Applying: updates PTP ref config
Using index info to reconstruct a base tree...
A	modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc
A	snippets/grandmaster-clock-ptp-config.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc deleted in HEAD and modified in updates PTP ref config. Version updates PTP ref config of modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc 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 updates PTP ref config
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:

/cherrypick enterprise-4.12

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

@jldohmann: #65252 failed to apply on top of branch "enterprise-4.11":

Applying: updates PTP ref config
Using index info to reconstruct a base tree...
A	modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc
A	snippets/grandmaster-clock-ptp-config.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc deleted in HEAD and modified in updates PTP ref config. Version updates PTP ref config of modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc 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 updates PTP ref config
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:

/cherrypick enterprise-4.11

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

@jldohmann: #65252 failed to apply on top of branch "enterprise-4.10":

Applying: updates PTP ref config
Using index info to reconstruct a base tree...
A	modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc
A	snippets/grandmaster-clock-ptp-config.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc deleted in HEAD and modified in updates PTP ref config. Version updates PTP ref config of modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc 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 updates PTP ref config
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:

/cherrypick enterprise-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.

@jldohmann
Copy link
Contributor

@aireilly it looks like the auto cherrypicks to 4.10-4.12 failed 😞 when you manually CP, please feel free to ping me to get those merged

@aireilly
Copy link
Contributor Author

Cool thanks :)

This was referenced Sep 29, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dfitzmau dfitzmau dfitzmau left review comments

@jldohmann jldohmann jldohmann approved these changes

Assignees

@josephdrichard josephdrichard

Labels
branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. telco Label for all Telco PRs
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@aireilly @ocpdocs-previewbot @dfitzmau @Bonnie-Block @josephdrichard @jldohmann @openshift-cherrypick-robot