openshift-docs
openshift-docs copied to clipboard
openshift
OSDOCS-10281: MicroShift-adding optional services to blueprint
Version(s): 4.15+
Issue: https://issues.redhat.com/browse/OSDOCS-10281 (but also covers 4.16 issues; making this procedure generic and evergreen)
Link to docs preview: Installing optional services Adding other services to blueprint
QE review:
- [ ] QE has approved this change.
@ShaunaDiaz: This pull request references OSDOCS-10281 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.15+
Issue: https://issues.redhat.com/browse/OSDOCS-10281
Link to docs preview:
QE review:
- [ ] QE has approved this change.
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.
🤖 Thu May 16 19:53:47 - Prow CI generated the docs preview:
https://75722--ocpdocs-pr.netlify.app/ https://75722--ocpdocs-pr.netlify.app/microshift/latest/microshift_configuring/microshift-cluster-access-kubeconfig.html https://75722--ocpdocs-pr.netlify.app/microshift/latest/microshift_install/microshift-embed-in-rpm-ostree.html https://75722--ocpdocs-pr.netlify.app/microshift/latest/microshift_install/microshift-install-rpm.html https://75722--ocpdocs-pr.netlify.app/microshift/latest/microshift_updating/microshift-update-rpms-ostree.html
@ShaunaDiaz: This pull request references OSDOCS-10281 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.15+
Issue: https://issues.redhat.com/browse/OSDOCS-10281 (but also covers 4.16 issues; making this procedure generic and evergreen)
Link to docs preview: Installing optional services Adding other services to blueprint
QE review:
- [ ] QE has approved this change.
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.
@ShaunaDiaz: 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[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@ShaunaDiaz: This pull request references OSDOCS-10281 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.15+
Issue: https://issues.redhat.com/browse/OSDOCS-10281 (but also covers 4.16 issues; making this procedure generic and evergreen)
Link to docs preview: Installing optional services Adding other services to blueprint
QE review:
- [x] QE has approved this change.
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.
@ShaunaDiaz: #75722 failed to apply on top of branch "enterprise-4.15":
Applying: OSDOCS-10281: MicroShift-adding optional services to blueprint
Using index info to reconstruct a base tree...
M microshift_install/microshift-install-rpm.adoc
M microshift_updating/microshift-update-rpms-ostree.adoc
A modules/microshift-install-multus-rpm.adoc
M modules/microshift-install-rpms-olm.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-install-rpms-olm.adoc
CONFLICT (modify/delete): modules/microshift-install-multus-rpm.adoc deleted in HEAD and modified in OSDOCS-10281: MicroShift-adding optional services to blueprint. Version OSDOCS-10281: MicroShift-adding optional services to blueprint of modules/microshift-install-multus-rpm.adoc left in tree.
Removing modules/microshift-adding-olm-to-blueprint.adoc
Auto-merging microshift_updating/microshift-update-rpms-ostree.adoc
Auto-merging microshift_install/microshift-install-rpm.adoc
CONFLICT (content): Merge conflict in microshift_install/microshift-install-rpm.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-10281: MicroShift-adding optional services to blueprint
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-sigs/prow repository.
@ShaunaDiaz: new pull request created: #76183
In response to this:
/cherrypick enterprise-4.16
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.