Skip to content

CCSINTL-3575: Short desc CQA fixes#114225

Merged
abrennan89 merged 1 commit into
openshift:mainfrom
abrennan89:shortdesc
Jun 26, 2026
Merged

CCSINTL-3575: Short desc CQA fixes#114225
abrennan89 merged 1 commit into
openshift:mainfrom
abrennan89:shortdesc

Conversation

@abrennan89 abrennan89 added this to the Continuous Release milestone Jun 26, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 26, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 26, 2026

Copy link
Copy Markdown

@abrennan89: This pull request references CCSINTL-3575 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.20+

Issue:
CCSINTL-3575

Link to docs preview:

QE review:
n/a - editing only for this PR

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 26, 2026
@ocpdocs-previewbot

Copy link
Copy Markdown

🤖 Fri Jun 26 15:55:29 - Prow CI generated the docs preview:
https://114225--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown

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

@sjhala-ccs sjhala-ccs left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just one nit, otherwise LGTM


[role="_abstract"]
As an OpenShift administrator, you can create or configure a physical network in the {product-title} web console without using the node network configuration policy (NNCP) page. The *Physical networks* page is available when the NMState console plugin is installed. When you use the *Physical networks* page in the web console, the NNCP is generated automatically. If you need more flexibility or require complex settings, use the NNCP page.
As an {product-title} administrator, you can create or configure a physical network in the {product-title} web console without using the node network configuration policy (NNCP) page.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am not sure if "node network configuration policy (NNCP)" is the name of the page in the web console, but the name should be in bold formatting


[NOTE]
====
The *Physical networks* page is available when the NMState console plugin is installed. When you use the *Physical networks* page in the web console, the NNCP is generated automatically. If you need more flexibility or require complex settings, use the NNCP page.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

s/NNCP/<actual_page_name_in_bold>

@abrennan89

Copy link
Copy Markdown
Contributor Author

Since this is high priority and we have a deadline for 6/30, I will merge this as is and we can check on the page names etc during the next phase for JTBD

@abrennan89 abrennan89 merged commit 12a5758 into openshift:main Jun 26, 2026
2 checks passed
@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: #114225 failed to apply on top of branch "enterprise-5.0":

Applying: CCSINTL-3575: Short desc CQA fixes
Using index info to reconstruct a base tree...
M	virt/vm_networking/virt-configuring-physical-networks.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/vm_networking/virt-configuring-physical-networks.adoc
CONFLICT (content): Merge conflict in virt/vm_networking/virt-configuring-physical-networks.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 CCSINTL-3575: Short desc CQA fixes

Details

In response to this:

/cherrypick enterprise-5.0

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

@abrennan89: new pull request created: #114244

Details

In response to this:

/cherrypick enterprise-4.22

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

@abrennan89: #114225 failed to apply on top of branch "enterprise-4.21":

Applying: CCSINTL-3575: Short desc CQA fixes
Using index info to reconstruct a base tree...
A	modules/con_virt-about-kubevirt-redfish.adoc
M	virt/vm_networking/virt-configuring-physical-networks.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/con_virt-about-kubevirt-redfish.adoc deleted in HEAD and modified in CCSINTL-3575: Short desc CQA fixes.  Version CCSINTL-3575: Short desc CQA fixes of modules/con_virt-about-kubevirt-redfish.adoc left in tree.
Auto-merging virt/vm_networking/virt-configuring-physical-networks.adoc
CONFLICT (content): Merge conflict in virt/vm_networking/virt-configuring-physical-networks.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 CCSINTL-3575: Short desc CQA fixes

Details

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

Copy link
Copy Markdown

@abrennan89: #114225 failed to apply on top of branch "enterprise-4.20":

Applying: CCSINTL-3575: Short desc CQA fixes
Using index info to reconstruct a base tree...
A	modules/con_virt-about-kubevirt-redfish.adoc
A	virt/vm_networking/virt-configuring-physical-networks.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/con_virt-about-kubevirt-redfish.adoc deleted in HEAD and modified in CCSINTL-3575: Short desc CQA fixes.  Version CCSINTL-3575: Short desc CQA fixes of modules/con_virt-about-kubevirt-redfish.adoc left in tree.
CONFLICT (modify/delete): virt/vm_networking/virt-configuring-physical-networks.adoc deleted in HEAD and modified in CCSINTL-3575: Short desc CQA fixes.  Version CCSINTL-3575: Short desc CQA fixes of virt/vm_networking/virt-configuring-physical-networks.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 set advice.mergeConflict false"
Patch failed at 0001 CCSINTL-3575: Short desc CQA fixes

Details

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.

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

Labels

branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-5.0 CNV Label for all CNV PRs jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

5 participants