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

[pipelines-docs] RHDEVDOCS-5518: Documenting Pipelines templates in the admin console #64318

Merged
merged 1 commit into from Sep 5, 2023

Conversation

abrennan89
Copy link
Contributor

Manual addition ("cherrypick") of content from #62463

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 5, 2023

@abrennan89: This pull request references RHDEVDOCS-5518 which is a valid jira issue.

In response to this:

Manual addition ("cherrypick") of content from #62463

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 5, 2023
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 5, 2023
@abrennan89 abrennan89 changed the title RHDEVDOCS-5518: Documenting Pipelines templates in the admin console [pipelines-docs] RHDEVDOCS-5518: Documenting Pipelines templates in the admin console Sep 5, 2023
@abrennan89
Copy link
Contributor Author

/cherrypick pipelines-docs-1.10

@openshift-cherrypick-robot

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.10 in a new PR and assign it to you.

In response to this:

/cherrypick pipelines-docs-1.10

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
Copy link
Contributor Author

/cherrypick pipelines-docs-1.11

@openshift-cherrypick-robot

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.11 in a new PR and assign it to you.

In response to this:

/cherrypick pipelines-docs-1.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.

@abrennan89
Copy link
Contributor Author

/cherrypick pipelines-docs-1.12

@openshift-cherrypick-robot

@abrennan89: once the present PR merges, I will cherry-pick it on top of pipelines-docs-1.12 in a new PR and assign it to you.

In response to this:

/cherrypick pipelines-docs-1.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.

@ocpdocs-previewbot
Copy link

@abrennan89 abrennan89 merged commit 7f658e7 into openshift:pipelines-docs Sep 5, 2023
1 check passed
@openshift-cherrypick-robot

@abrennan89: new pull request created: #64351

In response to this:

/cherrypick pipelines-docs-1.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: #64318 failed to apply on top of branch "pipelines-docs-1.10":

Applying: RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	create/creating-applications-with-cicd-pipelines.adoc
M	create/working-with-pipelines-using-the-developer-perspective.adoc
M	install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
A	modules/odc-adding-a-GitHub-repository-containing-pipelines.adoc
M	modules/op-constructing-pipelines-using-pipeline-builder.adoc
M	modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
M	modules/op-starting-pipelines-from-pipelines-view.adoc
M	modules/op-starting-pipelines-from-topology-view.adoc
Falling back to patching base and 3-way merge...
Removing modules/op-using-custom-pipeline-template-for-git-import.adoc
Auto-merging modules/op-starting-pipelines-from-topology-view.adoc
Auto-merging modules/op-starting-pipelines-from-pipelines-view.adoc
Auto-merging modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
CONFLICT (content): Merge conflict in modules/op-interacting-with-pipelines-using-the-developer-perspective.adoc
Auto-merging modules/op-constructing-pipelines-using-pipeline-builder.adoc
CONFLICT (modify/delete): modules/odc-adding-a-GitHub-repository-containing-pipelines.adoc deleted in HEAD and modified in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console. Version RHDEVDOCS-5518: Documenting Pipelines templates in the admin console of modules/odc-adding-a-GitHub-repository-containing-pipelines.adoc left in tree.
Auto-merging install_config/customizing-configurations-in-the-tektonconfig-cr.adoc
CONFLICT (modify/delete): create/working-with-pipelines-using-the-developer-perspective.adoc deleted in RHDEVDOCS-5518: Documenting Pipelines templates in the admin console and modified in HEAD. Version HEAD of create/working-with-pipelines-using-the-developer-perspective.adoc left in tree.
Auto-merging create/creating-applications-with-cicd-pipelines.adoc
CONFLICT (content): Merge conflict in create/creating-applications-with-cicd-pipelines.adoc
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
Patch failed at 0001 RHDEVDOCS-5518: Documenting Pipelines templates in the admin console
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 pipelines-docs-1.10

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: new pull request created: #64352

In response to this:

/cherrypick pipelines-docs-1.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.

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

None yet

4 participants