Skip to content

Conversation

@maxwelldb
Copy link
Contributor

@maxwelldb maxwelldb commented Oct 7, 2025

Version(s): 4.14+

Issue: https://issues.redhat.com/browse/OSDOCS-15979

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@maxwelldb maxwelldb self-assigned this Oct 7, 2025
@openshift-ci openshift-ci bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 7, 2025
@maxwelldb maxwelldb added this to the Continuous Release milestone Oct 7, 2025
@maxwelldb maxwelldb added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 7, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 7, 2025

🤖 Tue Oct 07 17:37:10 - Prow CI generated the docs preview:

https://100123--ocpdocs-pr.netlify.app/

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2025
@maxwelldb maxwelldb added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 7, 2025
@kalexand-rh
Copy link
Contributor

When it rebases cleanly, LGTM

@maxwelldb maxwelldb force-pushed the remove-deprecated-assemblies-osdocs15979 branch from 8e21f31 to 05e1544 Compare October 7, 2025 16:30
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2025
@maxwelldb maxwelldb force-pushed the remove-deprecated-assemblies-osdocs15979 branch from 904365f to 26b125c Compare October 7, 2025 17:26
@openshift-ci
Copy link

openshift-ci bot commented Oct 7, 2025

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

@maxwelldb
Copy link
Contributor Author

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick enterprise-4.19

@openshift-cherrypick-robot

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.14, enterprise-4.15, enterprise-4.16, enterprise-4.17, enterprise-4.18, enterprise-4.19 in new PRs and assign them to you.

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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.

@maxwelldb maxwelldb added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Oct 7, 2025
@maxwelldb maxwelldb merged commit a688721 into openshift:main Oct 7, 2025
2 checks passed
@openshift-cherrypick-robot

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.17":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.18":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.19":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.14":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.15":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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

@maxwelldb: #100123 failed to apply on top of branch "enterprise-4.16":

Applying: Remove deprecated assemblies - OSDOCS-15979
Using index info to reconstruct a base tree...
M	metering/configuring_metering/metering-common-config-options.adoc
M	metering/metering-installing-metering.adoc
M	metering/metering-upgrading-metering.adoc
Falling back to patching base and 3-way merge...
Removing metering/reports/metering-storage-locations.adoc
Removing metering/reports/metering-about-reports.adoc
Removing metering/metering-using-metering.adoc
Removing metering/metering-usage-examples.adoc
CONFLICT (modify/delete): metering/metering-upgrading-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-upgrading-metering.adoc left in tree.
Removing metering/metering-uninstall.adoc
Removing metering/metering-troubleshooting-debugging.adoc
CONFLICT (modify/delete): metering/metering-installing-metering.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/metering-installing-metering.adoc left in tree.
Removing metering/metering-about-metering.adoc
Removing metering/configuring_metering/metering-configure-reporting-operator.adoc
Removing metering/configuring_metering/metering-configure-persistent-storage.adoc
Removing metering/configuring_metering/metering-configure-hive-metastore.adoc
Removing metering/configuring_metering/metering-configure-aws-billing-correlation.adoc
CONFLICT (modify/delete): metering/configuring_metering/metering-common-config-options.adoc deleted in Remove deprecated assemblies - OSDOCS-15979 and modified in HEAD. Version HEAD of metering/configuring_metering/metering-common-config-options.adoc left in tree.
Removing metering/configuring_metering/metering-about-configuring.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 Remove deprecated assemblies - OSDOCS-15979

In response to this:

/cherry-pick enterprise-4.14
/cherry-pick enterprise-4.15
/cherry-pick enterprise-4.16
/cherry-pick enterprise-4.17
/cherry-pick enterprise-4.18
/cherry-pick 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.

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.

6 participants