OSDOCS-170721-batch1 #101503

dfitzmau · 2025-10-31T12:49:58Z

PR splits out commands to individual code blocks for better alignment with the RH SSG requirements.

Version(s):
4.14+

Issue:
OSDOCS-17072

Preview links

Additional information:
code_block_results.txt

Next PR started from edicated-logging-in-and-verifying-permissions.adoc.

ocpdocs-previewbot · 2025-10-31T13:02:25Z

🤖 Tue Nov 04 11:40:53 - Prow CI generated the docs preview:

JoeAldinger

/lgtm not sure how to advise on the .Example outputs sorry.

openshift-ci · 2025-11-04T11:41:43Z

@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 · 2025-11-04T12:25:48Z

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14

openshift-cherrypick-robot · 2025-11-04T12:26:37Z

@dfitzmau: #101503 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-170721-batch1
Using index info to reconstruct a base tree...
M	modules/ai-adding-worker-nodes-to-cluster.adoc
A	modules/albo-deleting.adoc
A	modules/albo-installation.adoc
A	modules/albo-prerequisites.adoc
A	modules/albo-validate-install.adoc
A	modules/cnf-image-based-upgrade-generate-seed-image.adoc
M	modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
CONFLICT (content): Merge conflict in modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
CONFLICT (modify/delete): modules/cnf-image-based-upgrade-generate-seed-image.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/cnf-image-based-upgrade-generate-seed-image.adoc left in tree.
CONFLICT (modify/delete): modules/albo-validate-install.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-validate-install.adoc left in tree.
CONFLICT (modify/delete): modules/albo-prerequisites.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-prerequisites.adoc left in tree.
CONFLICT (modify/delete): modules/albo-installation.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-installation.adoc left in tree.
CONFLICT (modify/delete): modules/albo-deleting.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-deleting.adoc left in tree.
Auto-merging modules/ai-adding-worker-nodes-to-cluster.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 OSDOCS-170721-batch1

In response to this:

/cherrypick enterprise-4.21
/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/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.

dfitzmau · 2025-11-04T12:34:39Z

/cherrypick enterprise-4.15

dfitzmau · 2025-11-04T12:34:43Z

/cherrypick enterprise-4.16

dfitzmau · 2025-11-04T12:34:47Z

/cherrypick enterprise-4.17

dfitzmau · 2025-11-04T12:34:50Z

/cherrypick enterprise-4.18

dfitzmau · 2025-11-04T12:34:58Z

/cherrypick enterprise-4.19

dfitzmau · 2025-11-04T12:35:02Z

/cherrypick enterprise-4.20

dfitzmau · 2025-11-04T12:35:05Z

/cherrypick enterprise-4.21

openshift-cherrypick-robot · 2025-11-04T12:35:28Z

@dfitzmau: #101503 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-170721-batch1
Using index info to reconstruct a base tree...
M	modules/ai-adding-worker-nodes-to-cluster.adoc
A	modules/albo-deleting.adoc
A	modules/albo-installation.adoc
A	modules/albo-prerequisites.adoc
A	modules/albo-validate-install.adoc
A	modules/cnf-image-based-upgrade-generate-seed-image.adoc
M	modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
CONFLICT (content): Merge conflict in modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
CONFLICT (modify/delete): modules/cnf-image-based-upgrade-generate-seed-image.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/cnf-image-based-upgrade-generate-seed-image.adoc left in tree.
CONFLICT (modify/delete): modules/albo-validate-install.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-validate-install.adoc left in tree.
CONFLICT (modify/delete): modules/albo-prerequisites.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-prerequisites.adoc left in tree.
CONFLICT (modify/delete): modules/albo-installation.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-installation.adoc left in tree.
CONFLICT (modify/delete): modules/albo-deleting.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-deleting.adoc left in tree.
Auto-merging modules/ai-adding-worker-nodes-to-cluster.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 OSDOCS-170721-batch1

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 · 2025-11-04T12:35:35Z

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

Applying: OSDOCS-170721-batch1
Using index info to reconstruct a base tree...
M	modules/ai-adding-worker-nodes-to-cluster.adoc
A	modules/albo-deleting.adoc
A	modules/albo-installation.adoc
A	modules/albo-prerequisites.adoc
A	modules/albo-validate-install.adoc
M	modules/cnf-image-based-upgrade-generate-seed-image.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-image-based-upgrade-generate-seed-image.adoc
CONFLICT (content): Merge conflict in modules/cnf-image-based-upgrade-generate-seed-image.adoc
CONFLICT (modify/delete): modules/albo-validate-install.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-validate-install.adoc left in tree.
CONFLICT (modify/delete): modules/albo-prerequisites.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-prerequisites.adoc left in tree.
CONFLICT (modify/delete): modules/albo-installation.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-installation.adoc left in tree.
CONFLICT (modify/delete): modules/albo-deleting.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-deleting.adoc left in tree.
Auto-merging modules/ai-adding-worker-nodes-to-cluster.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 OSDOCS-170721-batch1

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 · 2025-11-04T12:35:37Z

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

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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 · 2025-11-04T12:35:43Z

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

Applying: OSDOCS-170721-batch1
Using index info to reconstruct a base tree...
M	modules/ai-adding-worker-nodes-to-cluster.adoc
M	modules/albo-deleting.adoc
M	modules/albo-installation.adoc
M	modules/albo-prerequisites.adoc
A	modules/albo-validate-install.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/albo-validate-install.adoc deleted in HEAD and modified in OSDOCS-170721-batch1. Version OSDOCS-170721-batch1 of modules/albo-validate-install.adoc left in tree.
Auto-merging modules/albo-prerequisites.adoc
CONFLICT (content): Merge conflict in modules/albo-prerequisites.adoc
Auto-merging modules/albo-installation.adoc
Auto-merging modules/albo-deleting.adoc
CONFLICT (content): Merge conflict in modules/albo-deleting.adoc
Auto-merging modules/ai-adding-worker-nodes-to-cluster.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 OSDOCS-170721-batch1

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 · 2025-11-04T12:35:51Z

@dfitzmau: new pull request created: #101678

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 · 2025-11-04T12:35:55Z

@dfitzmau: new pull request created: #101679

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 · 2025-11-04T12:36:00Z

@dfitzmau: new pull request created: #101680

In response to this:

/cherrypick enterprise-4.21

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-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 31, 2025

dfitzmau added branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 labels Oct 31, 2025

dfitzmau force-pushed the OSDOCS-170721-batch1 branch from a640144 to 981f02c Compare October 31, 2025 12:55

dfitzmau force-pushed the OSDOCS-170721-batch1 branch 3 times, most recently from 0444912 to bb34819 Compare November 3, 2025 11:47

dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 3, 2025

JoeAldinger added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 3, 2025

JoeAldinger approved these changes Nov 3, 2025

View reviewed changes

JoeAldinger added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Nov 3, 2025

dfitzmau force-pushed the OSDOCS-170721-batch1 branch 4 times, most recently from 2d82a20 to e2bea15 Compare November 4, 2025 11:14

OSDOCS-170721-batch1

1c2bed1

dfitzmau force-pushed the OSDOCS-170721-batch1 branch from e2bea15 to 1c2bed1 Compare November 4, 2025 11:26

dfitzmau merged commit b75440e into openshift:main Nov 4, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Nov 4, 2025

[enterprise-4.19] OSDOCS-170721-batch1 #101678

Merged

openshift-cherrypick-robot mentioned this pull request Nov 4, 2025

[enterprise-4.20] OSDOCS-170721-batch1 #101679

Merged

openshift-cherrypick-robot mentioned this pull request Nov 4, 2025

[enterprise-4.21] OSDOCS-170721-batch1 #101680

Merged

OSDOCS-170721-batch1 #101503

OSDOCS-170721-batch1 #101503

Uh oh!

Conversation

dfitzmau commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JoeAldinger left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Nov 4, 2025

Uh oh!

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

dfitzmau commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dfitzmau commented Oct 31, 2025 •

edited

Loading

ocpdocs-previewbot commented Oct 31, 2025 •

edited

Loading