Skip to content

OSDOCS-8693: add Getting Support assembly MicroShift #68476

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

Merged
merged 1 commit into from
Nov 29, 2023

Conversation

ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Nov 28, 2023

Version(s):
4.14+

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

Link to docs preview:
Getting support
OCP Getting support

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with module that links to creating a Jira

@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 28, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with link to create a Jira

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 28, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 28, 2023

🤖 Updated build preview is available at:
https://68476--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/34965

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-8693 branch 2 times, most recently from 8b45b53 to fb953ed Compare November 28, 2023 16:52
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:
Getting support

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with link to create a Jira

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.

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-8693 branch 3 times, most recently from e033b76 to 2f03ef5 Compare November 28, 2023 20:42
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 28, 2023
@vwalek
Copy link
Contributor

vwalek commented Nov 28, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2023
@vwalek vwalek removed their assignment Nov 28, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 29, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:
Getting support
OCP Getting support)[https://68476--docspreview.netlify.app/openshift-enterprise/latest/support/getting-support]

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with link to create a Jira

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-robot
Copy link

openshift-ci-robot commented Nov 29, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:
Getting support
OCP Getting support)[https://68476--docspreview.netlify.app/openshift-enterprise/latest/support/getting-support]

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with link to create a Jira

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 removed the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2023
Copy link

openshift-ci bot commented Nov 29, 2023

New changes are detected. LGTM label has been removed.

@ShaunaDiaz
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Nov 29, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 29, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:
Getting support
OCP Getting support

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with link to create a Jira

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-robot
Copy link

openshift-ci-robot commented Nov 29, 2023

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

In response to this:

Version(s):
4.14+

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

Link to docs preview:
Getting support
OCP Getting support

Support review:

  • Support has approved this change.

Additional information:
Also replaces DDF with module that links to creating a Jira

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.

@aldiazRH
Copy link
Contributor

/label peer-review-in-progress
/remove-label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Nov 29, 2023
@openshift-ci openshift-ci bot removed the peer-review-needed Signifies that the peer review team needs to review this PR label Nov 29, 2023
@aldiazRH
Copy link
Contributor

LGTM!

@aldiazRH
Copy link
Contributor

/remove-label peer-review-in-progress
/label peer-review-done

@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 Nov 29, 2023
@ShaunaDiaz
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 29, 2023
@jldohmann jldohmann added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.14 branch/enterprise-4.15 labels Nov 29, 2023
@jldohmann jldohmann added this to the Continuous Release milestone Nov 29, 2023
Copy link
Contributor

@jldohmann jldohmann left a comment

Choose a reason for hiding this comment

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

LGTM, nice work Shauna!

@jldohmann jldohmann merged commit 1e6eda4 into openshift:main Nov 29, 2023
@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.15

@jldohmann
Copy link
Contributor

/cherrypick enterprise-4.14

@jldohmann jldohmann removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 29, 2023
@openshift-cherrypick-robot

@jldohmann: #68476 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-8693: add Getting Support assembly MicroShift
Using index info to reconstruct a base tree...
M	_attributes/attributes-microshift.adoc
M	modules/support.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/support.adoc
CONFLICT (content): Merge conflict in modules/support.adoc
Auto-merging _attributes/attributes-microshift.adoc
CONFLICT (content): Merge conflict in _attributes/attributes-microshift.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 OSDOCS-8693: add Getting Support assembly MicroShift
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.

@openshift-cherrypick-robot

@jldohmann: #68476 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-8693: add Getting Support assembly MicroShift
Using index info to reconstruct a base tree...
M	_attributes/attributes-microshift.adoc
M	_topic_maps/_topic_map_ms.yml
M	modules/support.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/support.adoc
CONFLICT (content): Merge conflict in modules/support.adoc
Auto-merging _topic_maps/_topic_map_ms.yml
Auto-merging _attributes/attributes-microshift.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 OSDOCS-8693: add Getting Support assembly MicroShift
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.

@jldohmann
Copy link
Contributor

@ShaunaDiaz it looks like you'll have to manually CP to the 4.14 and 4.15 branches 🙃 feel free to ping me when those are up and i'll merge for you

@vwalek
Copy link
Contributor

vwalek commented Nov 29, 2023

Hey, sorry, just read this sentence and do not understand what it means

Include data gathered using the sos tool or etcd as a starting point, 
plus any issue-specific data that is not collected in those logs.

There is no etcd tool, should be "inlcude data gathered using sos tool plus any issue-specific data."
I will report that as a new issue in jira.

@ShaunaDiaz
Copy link
Contributor Author

Hey, sorry, just read this sentence and do not understand what it means

Include data gathered using the sos tool or etcd as a starting point, 
plus any issue-specific data that is not collected in those logs.

There is no etcd tool, should be "inlcude data gathered using sos tool plus any issue-specific data." I will report that as a new issue in jira.

See docs here: https://access.redhat.com/documentation/en-us/red_hat_build_of_microshift/4.14/html/support/microshift-etcd

@bergerhoffer
Copy link
Contributor

@ShaunaDiaz @jldohmann It looks like this is failing because #67345 only went into 4.15. This should have gone into main too

@ShaunaDiaz Any time you are touching ANY files outside of the release notes file, it has to go into main first. Can you please get the necessary changes from that PR into main?

It also looks like this PR needs to get into main as well: #67051

I think you'll still need to do a manual cherrypick here though, because it's main where the items need to be resolved. But after all of this is resolved, then 4.15 and main should be in sync for these files currently in conflict.

The only file that should be out of sync is the actual release notes file.

@ShaunaDiaz
Copy link
Contributor Author

@ShaunaDiaz @jldohmann It looks like this is failing because #67345 only went into 4.15. This should have gone into main too

@ShaunaDiaz Any time you are touching ANY files outside of the release notes file, it has to go into main first. Can you please get the necessary changes from that PR into main?

It also looks like this PR needs to get into main as well: #67051

I think you'll still need to do a manual cherrypick here though, because it's main where the items need to be resolved. But after all of this is resolved, then 4.15 and main should be in sync for these files currently in conflict.

The only file that should be out of sync is the actual release notes file.

@bergerhoffer #67345 is the placement of the release notes file in 4.15 and should not go in the main (this the actual adoc, not the build file that went in main)

#67051 isn't my PR, I'm not certain what I can do with this one?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.14 branch/enterprise-4.15 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/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.

9 participants