Skip to content

Conversation

@amolnar-gh
Copy link
Contributor

@amolnar-gh amolnar-gh commented Jan 17, 2025

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 17, 2025
@openshift-ci-robot
Copy link

@amolnar-rh: This pull request references Jira Issue OCPBUGS-43683, which is invalid:

  • expected the bug to target the "4.19.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): 4.14, 4.15, 4.16, 4.17, 4.18

Issue: https://issues.redhat.com/browse/OCPBUGS-43683

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.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 17, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jan 17, 2025

@cgoncalves
Copy link
Contributor

LGTM with @zeeke's comments.

@openshift-ci
Copy link

openshift-ci bot commented Jan 21, 2025

@amolnar-rh: 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.

@zeeke
Copy link

zeeke commented Jan 21, 2025

/lgtm

Thanks for having addressed my comments!

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025
@evgenLevin
Copy link

/lgtm

@amolnar-gh
Copy link
Contributor 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 Jan 21, 2025
@xenolinux xenolinux 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 Jan 21, 2025
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

LGTM

General comment: To avoid openshift bots checking the state of Jira issues upon each update and printing unnecessary warnings, use # in the PR title instead of dash -- for example, OCPBUGS#12345: Fix the title

@xenolinux xenolinux 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 Jan 21, 2025
@amolnar-gh
Copy link
Contributor 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 Jan 22, 2025
@xenolinux xenolinux added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jan 22, 2025
@xenolinux xenolinux added this to the Continuous Release milestone Jan 22, 2025
@xenolinux xenolinux merged commit e4cad0a into openshift:main Jan 22, 2025
2 checks passed
@openshift-ci-robot
Copy link

@amolnar-rh: Jira Issue OCPBUGS-43683 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

In response to this:

Version(s): 4.14, 4.15, 4.16, 4.17, 4.18

Issue: https://issues.redhat.com/browse/OCPBUGS-43683

Link to docs preview:
https://87188--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/hardware_networks/configuring-sriov-device.html#nw-sriov-networknodepolicy-object_configuring-sriov-device

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.

@xenolinux xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jan 22, 2025
@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.14

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.15

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.16

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.17

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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.

@openshift-cherrypick-robot

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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.

@openshift-cherrypick-robot

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.16":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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

@xenolinux: #87188 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

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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.

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.17":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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.

@xenolinux
Copy link
Contributor

@amolnar-rh Sadly all of the automated CPs failed due to merge conflicts. Can you please create manual CPs?

@xenolinux
Copy link
Contributor

Trying to CP one more time to test

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@xenolinux: #87188 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-43683: Clarify MTU configuration in SR-IOV network node policy
Using index info to reconstruct a base tree...
M	modules/nw-sriov-networknodepolicy-object.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-sriov-networknodepolicy-object.adoc
CONFLICT (content): Merge conflict in modules/nw-sriov-networknodepolicy-object.adoc
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-43683: Clarify MTU configuration in SR-IOV network node policy

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.

@xenolinux
Copy link
Contributor

Strangely, this IMP note was not present in 4.14-4.18 but it was there in main (!!!), hence the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants