Skip to content

PR for SRVLOGIC-617: Troubleshoot and fix publishing issue for "Managing Upgrades" section in the OSL docs. #96059

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

Conversation

kaldesai
Copy link

@kaldesai kaldesai commented Jul 14, 2025

Notes for the reviewers: The "Managing Upgrades" section is currently not visible on the page, although the content is present in both the main and serverless-docs-1.36 branches. Pantheon is throwing errors related to file names and/or ID conflicts, which are likely causing the issue. This PR is intended to investigate and resolve those errors, ensuring the section is properly rendered and visible on the docs site. I have changed the . (dots) to the - (dash) in the ID and the file name. Hopefully, it will get resolved.

This PR does not require SME & QE review as the content is already acknowledged in the previous PRs. This is just to troubleshoot the pantheon side error.

Affected versions:

  • serverless-docs-1.37
  • serverless-docs-1.36
  • serverless-docs-1.35

Tracking JIRA: https://issues.redhat.com/browse/SRVLOGIC-617

Doc preview:

…ishing issue for the upgrades section in the docs
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 14, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 14, 2025

@kaldesai: This pull request references SRVLOGIC-617 which is a valid jira issue.

In response to this:

Notes for the reviewers: The "Managing Upgrades" section is currently not visible on the page, although the content is present in both the main and serverless-docs-1.36 branches. Pantheon is throwing errors related to file names and/or ID conflicts, which are likely causing the issue. This PR is intended to investigate and resolve those errors, ensuring the section is properly rendered and visible on the docs site.

Affected versions:

  • serverless-docs-1.37
  • serverless-docs-1.36
  • serverless-docs-1.35

Tracking JIRA: https://issues.redhat.com/browse/SRVLOGIC-617

Doc preview:

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/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 14, 2025
Copy link

openshift-ci bot commented Jul 14, 2025

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

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 14, 2025

@kaldesai: This pull request references SRVLOGIC-617 which is a valid jira issue.

In response to this:

Notes for the reviewers: The "Managing Upgrades" section is currently not visible on the page, although the content is present in both the main and serverless-docs-1.36 branches. Pantheon is throwing errors related to file names and/or ID conflicts, which are likely causing the issue. This PR is intended to investigate and resolve those errors, ensuring the section is properly rendered and visible on the docs site. I have changed the . (dots) to the - (dash) in the ID and the file name. Hopefully, it will get resolved.

This PR does not require SME & QE review as the content is already acknowledged in the previous PRs. This is just to troubleshoot the pantheon side error.

Affected versions:

  • serverless-docs-1.37
  • serverless-docs-1.36
  • serverless-docs-1.35

Tracking JIRA: https://issues.redhat.com/browse/SRVLOGIC-617

Doc preview:

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.

@kaldesai
Copy link
Author

/label serverless

@openshift-ci openshift-ci bot added the serverless Label for all Serverless PRs label Jul 14, 2025
@kaldesai
Copy link
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 Jul 14, 2025
@tmalove
Copy link
Contributor

tmalove commented Jul 14, 2025

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

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jul 14, 2025
@tmalove
Copy link
Contributor

tmalove commented Jul 14, 2025

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

@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 Jul 14, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2025
@kaldesai
Copy link
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 Jul 15, 2025
@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jul 15, 2025
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

@kaldesai LGTM - hope this fixes the issue you are seeing! 🤞

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

@openshift-ci openshift-ci bot 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 Jul 15, 2025
@jeana-redhat jeana-redhat merged commit 364350a into openshift:serverless-docs-main Jul 15, 2025
2 checks passed
@jeana-redhat
Copy link
Contributor

/cherrypick serverless-docs-1.37
/cherrypick serverless-docs-1.36
/cherrypick serverless-docs-1.35

@openshift-cherrypick-robot

@jeana-redhat: #96059 failed to apply on top of branch "serverless-docs-1.35":

Applying: SRVLOGIC-617-managing-upgrades-issue: Troubleshooting and fixing publishing issue for the upgrades section in the docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	serverless-logic/serverless-logic-managing-security/serverless-logic-authentication-third-party-services.adoc
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 SRVLOGIC-617-managing-upgrades-issue: Troubleshooting and fixing publishing issue for the upgrades section in the docs

In response to this:

/cherrypick serverless-docs-1.37
/cherrypick serverless-docs-1.36
/cherrypick serverless-docs-1.35

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.

@jeana-redhat
Copy link
Contributor

/cherrypick serverless-docs-1.37
/cherrypick serverless-docs-1.36

@openshift-cherrypick-robot

@jeana-redhat: new pull request created: #96132

In response to this:

/cherrypick serverless-docs-1.37
/cherrypick serverless-docs-1.36

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

@jeana-redhat: new pull request created: #96134

In response to this:

/cherrypick serverless-docs-1.37
/cherrypick serverless-docs-1.36

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.

@jeana-redhat
Copy link
Contributor

serverless-docs-1.35 needs a manual cherrypick

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR serverless Label for all Serverless PRs size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants