Skip to content

Conversation

@mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Oct 28, 2025

https://issues.redhat.com/browse/OSDOCS-16697

Adding the :_mod-docs-content-type: metadata to modules starting with O.

Did not alter the modules starting with the following:

oadp- None
odc- 5 files
op- Multiple files
osd- None
ossm- Multiple files

@ocpdocs-previewbot
Copy link

🤖 Tue Oct 28 15:53:41 - Prow CI generated the docs preview:
https://101178--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2025

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

@mburke5678 mburke5678 changed the title Update modules O-Q part 1 Update modules O-Q part 1 (O) Oct 28, 2025
@mburke5678 mburke5678 added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 28, 2025
@mburke5678 mburke5678 changed the title Update modules O-Q part 1 (O) OSDOCS Update modules O-Q part 1 (O) Oct 29, 2025
Copy link
Contributor

@bscott-rh bscott-rh left a comment

Choose a reason for hiding this comment

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

Merge review LGTM (co-reviewed with @brendan-daly-red-hat ). I'm assuming you meant to add the 4.21 label as well so I added that.

@bscott-rh bscott-rh added ok-to-merge and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 29, 2025
@mburke5678 mburke5678 merged commit f8f8f52 into openshift:main Oct 29, 2025
2 checks passed
@mburke5678 mburke5678 deleted the content-type-editor branch October 29, 2025 17:54
@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.14

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.15

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.16

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.17

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.18

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.19

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.20

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

@mburke5678: #101178 failed to apply on top of branch "enterprise-4.14":

Applying: Update modules O-Q part 1
Using index info to reconstruct a base tree...
A	modules/olm-bundle-schema.adoc
M	modules/olm-fb-catalogs-example.adoc
M	modules/olm-fb-catalogs-schemas.adoc
M	modules/olm-fb-catalogs-structure.adoc
M	modules/olm-operatorgroups-static.adoc
M	modules/olm-operatorgroups-target-namespace.adoc
A	modules/olm-package-schema.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/olm-package-schema.adoc deleted in HEAD and modified in Update modules O-Q part 1. Version Update modules O-Q part 1 of modules/olm-package-schema.adoc left in tree.
Auto-merging modules/olm-operatorgroups-target-namespace.adoc
Auto-merging modules/olm-operatorgroups-static.adoc
Auto-merging modules/olm-fb-catalogs-structure.adoc
CONFLICT (content): Merge conflict in modules/olm-fb-catalogs-structure.adoc
Auto-merging modules/olm-fb-catalogs-schemas.adoc
CONFLICT (content): Merge conflict in modules/olm-fb-catalogs-schemas.adoc
Auto-merging modules/olm-fb-catalogs-example.adoc
CONFLICT (modify/delete): modules/olm-bundle-schema.adoc deleted in HEAD and modified in Update modules O-Q part 1. Version Update modules O-Q part 1 of modules/olm-bundle-schema.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 advice.mergeConflict false"
Patch failed at 0001 Update modules O-Q part 1

In response to this:

/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.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #101336

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

@mburke5678: new pull request created: #101337

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

@mburke5678: new pull request created: #101338

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

@mburke5678: new pull request created: #101339

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

@mburke5678: new pull request created: #101340

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

@mburke5678: new pull request created: #101341

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

@mburke5678: new pull request created: #101342

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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants