Skip to content

Conversation

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 22, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 22, 2025

@ShaunaDiaz: This pull request references OSDOCS-14980 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 task to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.19.z" instead.

In response to this:

Version(s):
4.16+ (unlikely to CP cleanly)

Issue:
OSDOCS-14980

Link to docs preview:

QE review:

  • N/A refactoring for migration

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.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 22, 2025

🤖 Mon Sep 29 17:01:04 - Prow CI generated the docs preview:
https://99476--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 22, 2025

@ShaunaDiaz: This pull request references OSDOCS-14980 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 task to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.19.z" instead.

In response to this:

Version(s):
4.16+ (unlikely to CP cleanly)

Issue:
OSDOCS-14980

Link to docs preview-major updates:
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm/microshift-access-node.html
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm/microshift-stop-start.html

Smaller updates:
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_cli_ref/microshift-cli-tools-introduction.html
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift_auth_security/microshift-tls-config.html
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm/microshift-install-rpm.html
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.html
https://99476--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.html

QE review:

  • N/A refactoring for migration

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.

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-14980 branch 6 times, most recently from d1360a9 to 99662bf Compare September 29, 2025 11:19
@ShaunaDiaz ShaunaDiaz added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 29, 2025
Copy link
Contributor

@dfitzmau dfitzmau left a comment

Choose a reason for hiding this comment

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

Hi, @ShaunaDiaz . Just one comment for something that should be fixed. After the link is fixed, LGTM.

@ShaunaDiaz ShaunaDiaz removed the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 29, 2025
@tmalove
Copy link
Contributor

tmalove commented Sep 29, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

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

@ShaunaDiaz ShaunaDiaz merged commit b640472 into openshift:main Sep 29, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.20

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.19

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.18

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.17

@ShaunaDiaz
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@ShaunaDiaz: new pull request created: #99836

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

This comment was marked as resolved.

@openshift-cherrypick-robot

This comment was marked as resolved.

@openshift-cherrypick-robot

@ShaunaDiaz: #99476 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-14980: create stop-start-access assemblies MicroShift
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_ms.yml
M	microshift_cli_ref/microshift-cli-tools-introduction.adoc
A	microshift_configuring/microshift-ingress-controller.adoc
A	microshift_configuring/microshift_auth_security/microshift-tls-config.adoc
M	microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc
M	microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc
M	modules/microshift-accessing-cluster-locally.adoc
M	modules/microshift-accessing-cluster-open-firewall.adoc
M	modules/microshift-accessing-cluster-remotely.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-accessing-node-remotely.adoc
CONFLICT (content): Merge conflict in modules/microshift-accessing-node-remotely.adoc
Auto-merging modules/microshift-accessing-node-open-firewall.adoc
CONFLICT (content): Merge conflict in modules/microshift-accessing-node-open-firewall.adoc
Auto-merging modules/microshift-accessing-node-locally.adoc
Auto-merging microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc
Auto-merging microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc
CONFLICT (modify/delete): microshift_configuring/microshift_auth_security/microshift-tls-config.adoc deleted in HEAD and modified in OSDOCS-14980: create stop-start-access assemblies MicroShift. Version OSDOCS-14980: create stop-start-access assemblies MicroShift of microshift_configuring/microshift_auth_security/microshift-tls-config.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-ingress-controller.adoc deleted in HEAD and modified in OSDOCS-14980: create stop-start-access assemblies MicroShift. Version OSDOCS-14980: create stop-start-access assemblies MicroShift of microshift_configuring/microshift-ingress-controller.adoc left in tree.
Auto-merging microshift_cli_ref/microshift-cli-tools-introduction.adoc
CONFLICT (content): Merge conflict in microshift_cli_ref/microshift-cli-tools-introduction.adoc
Auto-merging _topic_maps/_topic_map_ms.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_ms.yml
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-14980: create stop-start-access assemblies MicroShift

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: #99476 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-14980: create stop-start-access assemblies MicroShift
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map_ms.yml
M	microshift_cli_ref/microshift-cli-tools-introduction.adoc
A	microshift_configuring/microshift-ingress-controller.adoc
A	microshift_configuring/microshift_auth_security/microshift-tls-config.adoc
M	microshift_install_rpm/microshift-install-rpm.adoc
M	microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc
M	microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc
M	microshift_running_apps/microshift-authentication.adoc
M	modules/microshift-accessing-cluster-locally.adoc
M	modules/microshift-accessing-cluster-open-firewall.adoc
M	modules/microshift-accessing-cluster-remotely.adoc
M	modules/microshift-kubeconfig-generating-remote-kcfiles.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-kubeconfig-generating-additional-files.adoc
Auto-merging modules/microshift-accessing-node-remotely.adoc
CONFLICT (content): Merge conflict in modules/microshift-accessing-node-remotely.adoc
Auto-merging modules/microshift-accessing-node-open-firewall.adoc
CONFLICT (content): Merge conflict in modules/microshift-accessing-node-open-firewall.adoc
Auto-merging modules/microshift-accessing-node-locally.adoc
Auto-merging microshift_running_apps/microshift-authentication.adoc
Auto-merging microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc
Auto-merging microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc
Auto-merging microshift_install_rpm/microshift-install-rpm.adoc
CONFLICT (content): Merge conflict in microshift_install_rpm/microshift-install-rpm.adoc
CONFLICT (modify/delete): microshift_configuring/microshift_auth_security/microshift-tls-config.adoc deleted in HEAD and modified in OSDOCS-14980: create stop-start-access assemblies MicroShift. Version OSDOCS-14980: create stop-start-access assemblies MicroShift of microshift_configuring/microshift_auth_security/microshift-tls-config.adoc left in tree.
CONFLICT (modify/delete): microshift_configuring/microshift-ingress-controller.adoc deleted in HEAD and modified in OSDOCS-14980: create stop-start-access assemblies MicroShift. Version OSDOCS-14980: create stop-start-access assemblies MicroShift of microshift_configuring/microshift-ingress-controller.adoc left in tree.
Auto-merging microshift_cli_ref/microshift-cli-tools-introduction.adoc
CONFLICT (content): Merge conflict in microshift_cli_ref/microshift-cli-tools-introduction.adoc
Auto-merging _topic_maps/_topic_map_ms.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_ms.yml
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-14980: create stop-start-access assemblies MicroShift

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.

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

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants