Skip to content

[release-4.17] OCPBUGS-43846: add chrony.conf file when additional NTP sources are configured #9142

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
Merged
merged 1 commit into from
Oct 31, 2024
Merged

[release-4.17] OCPBUGS-43846: add chrony.conf file when additional NTP sources are configured #9142

merged 1 commit into from
Oct 31, 2024
+168 −49

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #9095

/assign andfasano

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 25, 2024
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-39231 has been cloned as Jira Issue OCPBUGS-43846. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-43846: add chrony.conf file when additional NTP sources are configured

In response to this:

This is an automated cherry-pick of #9095

/assign andfasano

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.

@openshift-ci openshift-ci bot changed the title [release-4.17] OCPBUGS-39231: add chrony.conf file when additional NTP sources are configured [release-4.17] OCPBUGS-43846: add chrony.conf file when additional NTP sources are configured Oct 25, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 25, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-43846, 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.

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 #9095

/assign andfasano

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.

@openshift-ci openshift-ci bot requested review from andfasano and bfournie October 25, 2024 14:33
@andfasano
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@andfasano: This pull request references Jira Issue OCPBUGS-43846, 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.

@andfasano
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 25, 2024
@openshift-ci-robot
Copy link
Contributor

@andfasano: This pull request references Jira Issue OCPBUGS-43846, 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.17.z) matches configured target version for branch (4.17.z)
  • 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-39231 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-39231 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @mhanss

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.

@openshift-ci openshift-ci bot requested a review from mhanss October 25, 2024 14:59
@andfasano
Copy link
Contributor

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andfasano

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 25, 2024
@bfournie
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 25, 2024
@andfasano
Copy link
Contributor

/retest

@zaneb
Copy link
Member

zaneb commented Oct 31, 2024

/label backport-risk-assessed
/retest

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 31, 2024
@pamoedom
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 31, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 31, 2024

@openshift-cherrypick-robot: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 173ac4a into openshift:release-4.17 Oct 31, 2024
25 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

This is an automated cherry-pick of #9095

/assign andfasano

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.

@andfasano
Copy link
Contributor

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@andfasano: #9142 failed to apply on top of branch "release-4.16":

Applying: add chrony.conf file when additional NTP sources are configured
.git/rebase-apply/patch:26: trailing whitespace.
controlPlane: 
.git/rebase-apply/patch:29: trailing whitespace.
compute: 
.git/rebase-apply/patch:37: trailing whitespace.
  - cidr: 10.128.0.0/14 
.git/rebase-apply/patch:38: trailing whitespace.
    hostPrefix: 23 
.git/rebase-apply/patch:42: trailing whitespace.
  serviceNetwork: 
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/asset/agent/image/ignition.go
M	pkg/asset/agent/image/ignition_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/image/ignition_test.go
Auto-merging pkg/asset/agent/image/ignition.go
CONFLICT (content): Merge conflict in pkg/asset/agent/image/ignition.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 add chrony.conf file when additional NTP sources are configured

In response to this:

/cherry-pick release-4.16

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: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.17.0-202410311707.p0.g173ac4a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.17.0-202410311707.p0.g173ac4a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.17.0-202410311707.p0.g173ac4a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.17.0-202410311707.p0.g173ac4a.assembly.stream.el9.
All builds following this will include this PR.

@andfasano
Copy link
Contributor

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@andfasano: #9142 failed to apply on top of branch "release-4.16":

Applying: add chrony.conf file when additional NTP sources are configured
.git/rebase-apply/patch:26: trailing whitespace.
controlPlane: 
.git/rebase-apply/patch:29: trailing whitespace.
compute: 
.git/rebase-apply/patch:37: trailing whitespace.
  - cidr: 10.128.0.0/14 
.git/rebase-apply/patch:38: trailing whitespace.
    hostPrefix: 23 
.git/rebase-apply/patch:42: trailing whitespace.
  serviceNetwork: 
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/asset/agent/image/ignition.go
M	pkg/asset/agent/image/ignition_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/agent/image/ignition_test.go
Auto-merging pkg/asset/agent/image/ignition.go
CONFLICT (content): Merge conflict in pkg/asset/agent/image/ignition.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 add chrony.conf file when additional NTP sources are configured

In response to this:

/cherry-pick release-4.16

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.

@andfasano andfasano mentioned this pull request Nov 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andfasano andfasano

@bfournie bfournie

@mhanss mhanss

Assignees

@bfournie bfournie

@andfasano andfasano

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@openshift-cherrypick-robot @openshift-ci-robot @andfasano @bfournie @zaneb @pamoedom @openshift-bot