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

OCPBUGS-48847-move: Moved infinband file to nmstate doc #90225

Merged
merged 1 commit into from
Mar 18, 2025

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Mar 13, 2025

Moved the Creating an IP over InfiniBand interface on nodes file from Postinstallation configuration to Kubernetes NMState guide.

Version(s):
4.15+

Issue:
OCPBUGS-48847

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 13, 2025
Copy link

openshift-ci bot commented Mar 13, 2025

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

Copy link
Member

@cybertron cybertron left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2025
@dfitzmau dfitzmau added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 13, 2025
@cbippley
Copy link
Contributor

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

@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 Mar 13, 2025
Copy link
Contributor

@cbippley cbippley left a comment

Choose a reason for hiding this comment

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

LGTM!

@cbippley
Copy link
Contributor

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

@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 Mar 13, 2025
@rbbratta
Copy link

/lgtm

@dfitzmau dfitzmau merged commit aad939e into openshift:main Mar 18, 2025
2 checks passed
@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.16

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #90415

In response to this:

/cherrypick enterprise-4.19

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

@dfitzmau: new pull request created: #90416

In response to this:

/cherrypick enterprise-4.18

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

@dfitzmau: #90225 failed to apply on top of branch "enterprise-4.17":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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.

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #90417

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.

@openshift-cherrypick-robot

@dfitzmau: #90225 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-48847-move: Moved infinband file to nmstate doc
Using index info to reconstruct a base tree...
A	installing/installing_bare_metal/ipi/ipi-install-post-installation-configuration.adoc
M	networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
CONFLICT (content): Merge conflict in networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/ipi/ipi-install-post-installation-configuration.adoc deleted in HEAD and modified in OCPBUGS-48847-move: Moved infinband file to nmstate doc. Version OCPBUGS-48847-move: Moved infinband file to nmstate doc of installing/installing_bare_metal/ipi/ipi-install-post-installation-configuration.adoc left in tree.
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 OCPBUGS-48847-move: Moved infinband file to nmstate doc

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.

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #90425

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR 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