Skip to content

OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-br… #94273

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
Jul 24, 2025
Merged

OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-br… #94273

merged 1 commit into from
Jul 24, 2025
+24 −6

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Jun 4, 2025 •
edited
Loading

Version(s):
4.16+

Issue:
OCPBUGS-56925

Link to docs preview:

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

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

@dfitzmau: This pull request references Jira Issue OCPBUGS-56925, 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:

…idge.adoc for individual hostname paths

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 Jun 4, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 4, 2025 •
edited
Loading

🤖 Wed Jun 25 15:15:13 - Prow CI generated the docs preview:

https://94273--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/bare-metal-postinstallation-configuration.html
https://94273--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/ipi/ipi-install-installation-workflow.html
https://94273--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal.html
https://94273--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.html
https://94273--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.html

@cybertron cybertron mentioned this pull request Jun 9, 2025
Merged
3 tasks
cybertron
cybertron reviewed Jun 9, 2025
View reviewed changes
@dfitzmau dfitzmau force-pushed the OCPBUGS-56925 branch 2 times, most recently from e9a8bdd to e20c9f4 Compare June 9, 2025 19:10
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 14, 2025
@bergerhoffer
Copy link
Contributor

The branch/enterprise-4.20 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.19. And any PR going into main must also target the latest version branch (enterprise-4.20).

If the update in your PR does NOT apply to version 4.20 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 18, 2025
cybertron
cybertron reviewed Jun 18, 2025
View reviewed changes
Copy link
Member

@cybertron cybertron 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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 18, 2025
@dfitzmau dfitzmau added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 19, 2025
mburke5678
mburke5678 reviewed Jun 19, 2025
View reviewed changes
@mburke5678
Copy link
Contributor

@dfitzmau Just a couple random thoughts. Maybe I am missing something. Otherwise LGTM

@mburke5678 mburke5678 added peer-review-in-progress Signifies that the peer review team is reviewing this PR 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 peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 19, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 19, 2025
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 19, 2025
rbbratta
rbbratta reviewed Jun 25, 2025
View reviewed changes
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 25, 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.

@rbbratta
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2025
@dfitzmau dfitzmau merged commit 6c8d067 into openshift:main Jul 24, 2025
2 checks passed
@openshift-ci-robot
Copy link

@dfitzmau: Jira Issue OCPBUGS-56925: All pull requests linked via external trackers have merged:

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

In response to this:

Version(s):
4.16+

Issue:
OCPBUGS-56925

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.

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

@dfitzmau: new pull request created: #96670

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 24, 2025
Merged
@openshift-cherrypick-robot
Copy link

@dfitzmau: new pull request created: #96671

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

@dfitzmau: #94273 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths
Using index info to reconstruct a base tree...
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (content): Merge conflict in modules/creating-manifest-file-customized-br-ex-bridge.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-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths

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 openshift-cherrypick-robot mentioned this pull request Jul 24, 2025
Merged
@openshift-cherrypick-robot
Copy link

@dfitzmau: #94273 failed to apply on top of branch "enterprise-4.17":

Applying: OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths
Using index info to reconstruct a base tree...
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (content): Merge conflict in modules/creating-manifest-file-customized-br-ex-bridge.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-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths

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

@dfitzmau: #94273 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths
Using index info to reconstruct a base tree...
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (content): Merge conflict in modules/creating-manifest-file-customized-br-ex-bridge.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-56925: Updated the creating-manifest-file-customized-br-ex-bridge.adoc for individual hostname paths

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.

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

@cybertron cybertron cybertron left review comments

@rbbratta rbbratta rbbratta left review comments

@mburke5678 mburke5678 mburke5678 left review comments

Assignees

@cybertron cybertron

@rbbratta rbbratta

Labels
branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/invalid-bug Indicates that a referenced Jira bug is invalid 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. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dfitzmau @openshift-ci-robot @ocpdocs-previewbot @bergerhoffer @mburke5678 @rbbratta @openshift-cherrypick-robot @cybertron @openshift-merge-robot