Skip to content

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Aug 18, 2025

Version(s):
4.12+

Issue:
OCPBUGS-54741

Link to docs preview:

  • SME has approved this change (Matt Robson).
  • QE has approved this change (Zhenying Niu).

@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 Aug 18, 2025
@openshift-ci-robot
Copy link

@dfitzmau: This pull request references Jira Issue OCPBUGS-54741, which is invalid:

  • expected the bug to target the "4.20.0" version, but no target version was set

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:

Version(s):
4.12+

Issue:
OCPBUGS-59950

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

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 added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 18, 2025
Copy link

openshift-ci bot commented Aug 18, 2025

@dfitzmau: 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.

@dfitzmau dfitzmau changed the title OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs OCPBUGS#54741: Removed balance-tlb references from Agent Installer docs Aug 18, 2025
@openshift-ci-robot openshift-ci-robot removed 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 Aug 18, 2025
@openshift-ci-robot
Copy link

@dfitzmau: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-59950

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

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.

@mrobson
Copy link

mrobson commented Aug 18, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2025
@zniu1011
Copy link

/lgtm

@dfitzmau dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 19, 2025
@ShaunaDiaz ShaunaDiaz added ok-to-merge and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 19, 2025
@ShaunaDiaz ShaunaDiaz added this to the Continuous Release milestone Aug 19, 2025
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz left a comment

Choose a reason for hiding this comment

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

/lgtm

@ShaunaDiaz ShaunaDiaz merged commit d3c35db into openshift:main Aug 19, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.12

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.13

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.14

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.15

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.16

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.17

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.18

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.19

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@ShaunaDiaz: #97672 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs
Using index info to reconstruct a base tree...
A	modules/agent-install-sample-config-bond-sriov.adoc
A	modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc deleted in HEAD and modified in OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs. Version OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs of modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc left in tree.
CONFLICT (modify/delete): modules/agent-install-sample-config-bond-sriov.adoc deleted in HEAD and modified in OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs. Version OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs of modules/agent-install-sample-config-bond-sriov.adoc left in tree.
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 OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs

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-sigs/prow repository.

@openshift-cherrypick-robot

@ShaunaDiaz: #97672 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs
Using index info to reconstruct a base tree...
M	modules/agent-install-sample-config-bond-sriov.adoc
M	modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Auto-merging modules/agent-install-sample-config-bond-sriov.adoc
CONFLICT (content): Merge conflict in modules/agent-install-sample-config-bond-sriov.adoc
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 OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs

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-sigs/prow repository.

@openshift-cherrypick-robot

@ShaunaDiaz: #97672 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs
Using index info to reconstruct a base tree...
M	modules/agent-install-sample-config-bond-sriov.adoc
M	modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Auto-merging modules/agent-install-sample-config-bond-sriov.adoc
CONFLICT (content): Merge conflict in modules/agent-install-sample-config-bond-sriov.adoc
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 OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs

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-sigs/prow repository.

@openshift-cherrypick-robot

@ShaunaDiaz: #97672 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs
Using index info to reconstruct a base tree...
M	modules/agent-install-sample-config-bond-sriov.adoc
M	modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Auto-merging modules/agent-install-sample-config-bond-sriov.adoc
CONFLICT (content): Merge conflict in modules/agent-install-sample-config-bond-sriov.adoc
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 OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs

In response to this:

/cherrypick enterprise-4.15

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

@ShaunaDiaz: #97672 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs
Using index info to reconstruct a base tree...
M	modules/agent-install-sample-config-bond-sriov.adoc
M	modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
CONFLICT (content): Merge conflict in modules/ipi-install-configuring-host-dual-network-interfaces-in-the-install-config.yaml-file.adoc
Auto-merging modules/agent-install-sample-config-bond-sriov.adoc
CONFLICT (content): Merge conflict in modules/agent-install-sample-config-bond-sriov.adoc
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 OCPBUGS-54741: Removed balance-tlb references from Agent Installer docs

In response to this:

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

@ShaunaDiaz: new pull request created: #97738

In response to this:

/cherrypick enterprise-4.17

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

@ShaunaDiaz: new pull request created: #97739

In response to this:

/cherrypick enterprise-4.18

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

@ShaunaDiaz: new pull request created: #97740

In response to this:

/cherrypick enterprise-4.19

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

@ShaunaDiaz: new pull request created: #97741

In response to this:

/cherrypick enterprise-4.20

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.

@ShaunaDiaz
Copy link
Contributor

@dfitzmau Looks like you'll need manual CPs to backport all the way.

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.

7 participants