openshift
OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
Version(s): 4.12+
Issue: OCPBUGS-33761
Link to docs preview:
- [ ] SME has approved this change
- [ ] QE has approved this change.
Additional information:
@dfitzmau: This pull request references Jira Issue OCPBUGS-33761, which is invalid:
- expected the bug to target the "4.17.0" version, but no target version was set
Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
In response to this:
Version(s):
Issue:
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 openshift-eng/jira-lifecycle-plugin repository.
🤖 Wed Jul 10 16:39:41 - Prow CI generated the docs preview:
https://76876--ocpdocs-pr.netlify.app/ https://76876--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/ovn_kubernetes_network_provider/rollback-to-openshift-sdn.html
@dfitzmau: This pull request references Jira Issue OCPBUGS-33761, which is invalid:
- expected the bug to target the "4.17.0" version, but no target version was set
- expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead
Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
In response to this:
Version(s): 4.12+
Issue: OCPBUGS-33761
Link to docs preview:
- [ ] SME has approved this change
- [ ] 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 openshift-eng/jira-lifecycle-plugin repository.
@dfitzmau: 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}
@dfitzmau: Jira Issue OCPBUGS-33761 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.
In response to this:
Version(s): 4.12+
Issue: OCPBUGS-33761
Link to docs preview:
- [x] SME has approved this change
- [x] 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 openshift-eng/jira-lifecycle-plugin repository.
@skopacz1: #76876 failed to apply on top of branch "enterprise-4.12":
Applying: OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
Using index info to reconstruct a base tree...
M modules/nw-ovn-kubernetes-rollback.adoc
M networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Auto-merging modules/nw-ovn-kubernetes-rollback.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-rollback.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 OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
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-sigs/prow repository.
@skopacz1: #76876 failed to apply on top of branch "enterprise-4.13":
Applying: OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
Using index info to reconstruct a base tree...
M modules/nw-ovn-kubernetes-rollback.adoc
M networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Auto-merging modules/nw-ovn-kubernetes-rollback.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-rollback.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 OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
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-sigs/prow repository.
@skopacz1: #76876 failed to apply on top of branch "enterprise-4.14":
Applying: OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
Using index info to reconstruct a base tree...
M modules/nw-ovn-kubernetes-rollback.adoc
M networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Auto-merging modules/nw-ovn-kubernetes-rollback.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-rollback.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 OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
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-sigs/prow repository.
@skopacz1: #76876 failed to apply on top of branch "enterprise-4.15":
Applying: OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
Using index info to reconstruct a base tree...
M modules/nw-ovn-kubernetes-rollback.adoc
M networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/openshift_sdn/migrate-to-openshift-sdn.adoc
Auto-merging modules/nw-ovn-kubernetes-rollback.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-rollback.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 OCPBUGS-33761: Expand the rolling back steps for the SDN network plugin
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.
@skopacz1: new pull request created: #78740
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.
@skopacz1: new pull request created: #78741
In response to this:
/cherrypick enterprise-4.17
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.