Skip to content

OSDOCS-20340: CQA-RHCL-update#115875

Merged
ShaunaDiaz merged 1 commit into
openshift:rhcl-docs-mainfrom
ShaunaDiaz:OSDOCS-20340
Jul 22, 2026
Merged

OSDOCS-20340: CQA-RHCL-update#115875
ShaunaDiaz merged 1 commit into
openshift:rhcl-docs-mainfrom
ShaunaDiaz:OSDOCS-20340

Conversation

@ShaunaDiaz

@ShaunaDiaz ShaunaDiaz commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Version(s):
rhcl-docs-1.5
rhcl-docs-1.4

Issue:
OSDOCS-20340

Link to docs preview:
https://115875--ocpdocs-pr.netlify.app/rhcl/latest/update/updating-rhcl.html

QE review:

  • N/A, internal docs work

Additional information:
Hold/rebase for install CQA work that impacts this section.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 20, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 20, 2026

Copy link
Copy Markdown

@ShaunaDiaz: This pull request references OSDOCS-20340 which is a valid jira issue.

Details

In response to this:

Version(s):
rhcl-docs-1.5
rhcl-docs-1.4

Issue:
OSDOCS-20340

Link to docs preview:

QE review:

  • N/A, internal docs work

Additional information:
Hold/rebase for install CQA work that impacts this section.

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 20, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Jul 20, 2026

Copy link
Copy Markdown

🤖 Wed Jul 22 16:44:48 - Prow CI generated the docs preview:

https://115875--ocpdocs-pr.netlify.app/rhcl/latest/update/updating-rhcl.html

@ShaunaDiaz ShaunaDiaz added rhcl-docs-1.4 Red Hat Connectivity Link docs, version 1.4 rhcl-docs-1.5 label for PRs that need to go into Red Hat Connectivity Link 1.5 documentation labels Jul 21, 2026
@ShaunaDiaz
ShaunaDiaz force-pushed the OSDOCS-20340 branch 2 times, most recently from a53ddc9 to e4229be Compare July 21, 2026 18:15
@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 21, 2026
@ShaunaDiaz
ShaunaDiaz force-pushed the OSDOCS-20340 branch 2 times, most recently from 21ec842 to 018e481 Compare July 22, 2026 16:36
@openshift-ci

openshift-ci Bot commented Jul 22, 2026

Copy link
Copy Markdown

@ShaunaDiaz: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@ShaunaDiaz
ShaunaDiaz merged commit 877dda8 into openshift:rhcl-docs-main Jul 22, 2026
2 checks passed
@ShaunaDiaz

Copy link
Copy Markdown
Contributor Author

/cherrypick rhcl-docs-1.5

@ShaunaDiaz

Copy link
Copy Markdown
Contributor Author

/cherrypick rhcl-docs-1.4

@openshift-cherrypick-robot

Copy link
Copy Markdown

@ShaunaDiaz: #115875 failed to apply on top of branch "rhcl-docs-1.4":

Applying: OSDOCS-20340: CQA-RHCL-update
Using index info to reconstruct a base tree...
M	modules/proc-update-rhcl-with-web-console.adoc
M	updating/updating-rhcl.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/proc-update-rhcl-with-web-console.adoc
CONFLICT (modify/delete): update/_attributes deleted in HEAD and modified in OSDOCS-20340: CQA-RHCL-update.  Version OSDOCS-20340: CQA-RHCL-update of update/_attributes left in tree.
CONFLICT (modify/delete): update/images deleted in HEAD and modified in OSDOCS-20340: CQA-RHCL-update.  Version OSDOCS-20340: CQA-RHCL-update of update/images left in tree.
CONFLICT (modify/delete): update/modules deleted in HEAD and modified in OSDOCS-20340: CQA-RHCL-update.  Version OSDOCS-20340: CQA-RHCL-update of update/modules left in tree.
CONFLICT (modify/delete): update/snippets deleted in HEAD and modified in OSDOCS-20340: CQA-RHCL-update.  Version OSDOCS-20340: CQA-RHCL-update of update/snippets left in tree.
Auto-merging update/updating-rhcl.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-20340: CQA-RHCL-update

Details

In response to this:

/cherrypick rhcl-docs-1.4

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

@ShaunaDiaz: new pull request created: #116210

Details

In response to this:

/cherrypick rhcl-docs-1.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. rhcl-docs-1.4 Red Hat Connectivity Link docs, version 1.4 rhcl-docs-1.5 label for PRs that need to go into Red Hat Connectivity Link 1.5 documentation size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants