Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OBSDOCS-675: Clean up logging installation CLI docs #67450

Merged
merged 1 commit into from Dec 18, 2023

Conversation

@abrennan89 abrennan89 added this to the Continuous Release milestone Nov 6, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 6, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 6, 2023

@abrennan89: This pull request references OBSDOCS-93 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

Issue:
https://issues.redhat.com/browse/OBSDOCS-93
https://issues.redhat.com/browse/OBSDOCS-152 (also related to restructuring)

Link to docs preview:

QE review:

  • QE has approved this change.

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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2023
@openshift-ci openshift-ci bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 6, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 6, 2023

🤖 Mon Dec 18 16:55:20 - Prow CI generated the docs preview: https://67450--ocpdocs-pr.netlify.app

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 7, 2023

@abrennan89: This pull request references OBSDOCS-93 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

Issue:
https://issues.redhat.com/browse/OBSDOCS-93
https://issues.redhat.com/browse/OBSDOCS-152 (also related to restructuring)

Link to docs preview:

QE review:

  • QE has approved this change.

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 kubernetes/test-infra repository.

@abrennan89 abrennan89 force-pushed the OBSDOCS-93 branch 2 times, most recently from bb81efd to bae48df Compare November 7, 2023 17:46
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2023
@abrennan89 abrennan89 force-pushed the OBSDOCS-93 branch 4 times, most recently from d6f2cf4 to 68c5c31 Compare November 13, 2023 16:06
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 7, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 7, 2023

@abrennan89: This pull request references OBSDOCS-93 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

Issue:
https://issues.redhat.com/browse/OBSDOCS-93
https://issues.redhat.com/browse/OBSDOCS-152 (also related to restructuring)

Link to docs preview:

QE review:

  • QE has approved this change.

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 kubernetes/test-infra repository.

@abrennan89 abrennan89 changed the title [WIP] OBSDOCS-93: Clean up logging installation CLI docs OBSDOCS-93: Clean up logging installation CLI docs Dec 7, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 7, 2023
@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Dec 18, 2023
@dfitzmau
Copy link
Contributor

/remove-label peer-review-needed

@openshift-ci openshift-ci bot removed the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 18, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2023
Copy link

openshift-ci bot commented Dec 18, 2023

New changes are detected. LGTM label has been removed.

@abrennan89 abrennan89 force-pushed the OBSDOCS-93 branch 3 times, most recently from 244bce0 to 594835f Compare December 18, 2023 16:31
Copy link

openshift-ci bot commented Dec 18, 2023

@abrennan89: 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/test-infra repository. I understand the commands that are listed here.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 18, 2023

@abrennan89: This pull request references OBSDOCS-675 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.16.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

Issue:
https://issues.redhat.com/browse/OBSDOCS-675

Link to docs preview:

QE review:

  • QE has approved this change.

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 kubernetes/test-infra repository.

@abrennan89 abrennan89 merged commit abef6a0 into openshift:main Dec 18, 2023
3 checks passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@abrennan89: #67450 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-93: Clean up logging installation CLI docs
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	_attributes/common-attributes.adoc
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	snippets/logging-stable-updates-snip.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-stable-updates-snip.adoc
Removing modules/logging-clo-gui-install.adoc
Removing modules/logging-clo-cli-install.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
Auto-merging _attributes/common-attributes.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-93: Clean up logging installation CLI docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.11

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/test-infra repository.

@openshift-cherrypick-robot

@abrennan89: #67450 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-93: Clean up logging installation CLI docs
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	_attributes/common-attributes.adoc
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-console.adoc
M	snippets/logging-stable-updates-snip.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-stable-updates-snip.adoc
Removing modules/logging-clo-gui-install.adoc
Removing modules/logging-clo-cli-install.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
Auto-merging _attributes/common-attributes.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-93: Clean up logging installation CLI docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.12

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/test-infra repository.

@openshift-cherrypick-robot

@abrennan89: #67450 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-93: Clean up logging installation CLI docs
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	_attributes/common-attributes.adoc
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-console.adoc
M	snippets/logging-stable-updates-snip.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-stable-updates-snip.adoc
Removing modules/logging-clo-gui-install.adoc
Removing modules/logging-clo-cli-install.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
Auto-merging _attributes/common-attributes.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-93: Clean up logging installation CLI docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.13

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/test-infra repository.

@openshift-cherrypick-robot

@abrennan89: #67450 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-93: Clean up logging installation CLI docs
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	modules/cluster-logging-deploy-console.adoc
M	snippets/logging-stable-updates-snip.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-stable-updates-snip.adoc
CONFLICT (content): Merge conflict in snippets/logging-stable-updates-snip.adoc
Removing modules/logging-clo-gui-install.adoc
Removing modules/logging-clo-cli-install.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.adoc
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-93: Clean up logging installation CLI docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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/test-infra repository.

@openshift-cherrypick-robot

@abrennan89: #67450 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-93: Clean up logging installation CLI docs
Using index info to reconstruct a base tree...
M	_attributes/attributes-openshift-dedicated.adoc
M	_attributes/common-attributes.adoc
M	modules/cluster-logging-deploy-console.adoc
M	snippets/logging-stable-updates-snip.adoc
Falling back to patching base and 3-way merge...
Auto-merging snippets/logging-stable-updates-snip.adoc
CONFLICT (content): Merge conflict in snippets/logging-stable-updates-snip.adoc
Removing modules/logging-clo-gui-install.adoc
Removing modules/logging-clo-cli-install.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-console.adoc
Auto-merging _attributes/common-attributes.adoc
Auto-merging _attributes/attributes-openshift-dedicated.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-93: Clean up logging installation CLI docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants