Skip to content

Conversation

@EricPonvelle
Copy link
Contributor

Reverts #99307 to working order.

@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 29, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 29, 2025

@EricPonvelle: This pull request references OSDOCS-14501 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 "4.21.0" version, but no target version was set.

In response to this:

Reverts #99307 to working order.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 29, 2025
@EricPonvelle EricPonvelle changed the title Revert "Revert "OSDOCS-14501: Prune Operators"" Restore OSDOCS-14501: Prune Operators Sep 29, 2025
@EricPonvelle EricPonvelle changed the title Restore OSDOCS-14501: Prune Operators Restores OSDOCS-14501: Prune Operators Sep 29, 2025
@ocpdocs-previewbot
Copy link

🤖 Mon Sep 29 14:34:27 - Prow CI generated the docs preview:
https://99812--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2025

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

@EricPonvelle EricPonvelle merged commit 42731a4 into main Sep 29, 2025
2 checks passed
@EricPonvelle
Copy link
Contributor Author

/cherrypick enterprise-4.19

@EricPonvelle
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@EricPonvelle: #99812 failed to apply on top of branch "enterprise-4.19":

Applying: Revert "Revert "OSDOCS-14501: Prune Operators""
.git/rebase-apply/patch:50: trailing whitespace.
As catalogs are updated, the latest versions of Operators change, and older versions may be removed or altered. In addition, when OLM runs on 
.git/rebase-apply/patch:52: trailing whitespace.
an {product-title} 
.git/rebase-apply/patch:55: trailing whitespace.
a {product-title} 
.git/rebase-apply/patch:71: trailing whitespace.
In {product-title} {product-version}, 
.git/rebase-apply/patch:73: trailing whitespace.
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] 
warning: squelched 19 whitespace errors
warning: 24 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/olm-catalogsource-image-template.adoc
M	modules/olm-csv.adoc
M	modules/olm-installing-operators-from-operatorhub.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-installing-operators-from-operatorhub.adoc
Auto-merging modules/olm-csv.adoc
Auto-merging modules/olm-catalogsource-image-template.adoc
CONFLICT (content): Merge conflict in modules/olm-catalogsource-image-template.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 Revert "Revert "OSDOCS-14501: Prune Operators""

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

@EricPonvelle: new pull request created: #99840

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

4 participants