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-38010: [release-4.16]: Skip firmware reset on devices the operator doesn't control #980

Merged
merged 5 commits into from
Aug 12, 2024

Conversation

zeeke
Copy link
Contributor

@zeeke zeeke commented Aug 6, 2024

4.16 Backport of

no conflicts

This should fix the failing test

[It] [sriov] operator Custom SriovNetworkNodePolicy ExternallyManaged Validation Should create a policy if the number of requested vfs is equal and not delete them when the policy is removed

cc @SchSeba

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
This commit makes the functions to return error if we are not able to
read from the configuration cache on the node.

Also this commit fix a bug when checking if a MLX card is controlled by
the operator

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
@zeeke
Copy link
Contributor Author

zeeke commented Aug 6, 2024

/jira cherrypick OCPBUGS-36683

@openshift-ci-robot
Copy link
Contributor

@zeeke: Jira Issue OCPBUGS-36683 has been cloned as Jira Issue OCPBUGS-38010. Will retitle bug to link to clone.
/retitle OCPBUGS-38010: [release-4.16]: Skip firmware reset on devices the operator doesn't control

In response to this:

/jira cherrypick OCPBUGS-36683

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 changed the title [release-4.16]: Skip firmware reset on devices the operator doesn't control OCPBUGS-38010: [release-4.16]: Skip firmware reset on devices the operator doesn't control Aug 6, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 6, 2024
@openshift-ci-robot
Copy link
Contributor

@zeeke: This pull request references Jira Issue OCPBUGS-38010, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected dependent Jira Issue OCPBUGS-36683 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
  • expected dependent Jira Issue OCPBUGS-36683 to target a version in 4.17.0, 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:

4.16 Backport of

no conflicts

This should fix the failing test

[It] [sriov] operator Custom SriovNetworkNodePolicy ExternallyManaged Validation Should create a policy if the number of requested vfs is equal and not delete them when the policy is removed

cc @SchSeba

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 6, 2024
Copy link
Contributor

openshift-ci bot commented Aug 6, 2024

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

@SchSeba
Copy link
Contributor

SchSeba commented Aug 8, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 8, 2024
@openshift-ci-robot
Copy link
Contributor

@SchSeba: This pull request references Jira Issue OCPBUGS-38010, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.z) matches configured target version for branch (4.16.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-36683 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-36683 targets the "4.17.0" version, which is one of the valid target versions: 4.17.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (elevin@redhat.com), skipping review request.

In response to this:

/jira refresh

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.

@SchSeba
Copy link
Contributor

SchSeba commented Aug 8, 2024

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 8, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 8, 2024
Copy link
Contributor

openshift-ci bot commented Aug 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SchSeba, zeeke

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 8, 2024
@evgenLevin
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 12, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 48d1049 into openshift:release-4.16 Aug 12, 2024
11 checks passed
@openshift-ci-robot
Copy link
Contributor

@zeeke: Jira Issue OCPBUGS-38010: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-38010 has been moved to the MODIFIED state.

In response to this:

4.16 Backport of

no conflicts

This should fix the failing test

[It] [sriov] operator Custom SriovNetworkNodePolicy ExternallyManaged Validation Should create a policy if the number of requested vfs is equal and not delete them when the policy is removed

cc @SchSeba

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

[ART PR BUILD NOTIFIER]

Distgit: sriov-network-config-daemon
This PR has been included in build sriov-network-config-daemon-container-v4.16.0-202408120337.p0.g48d1049.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: sriov-network-operator
This PR has been included in build sriov-network-operator-container-v4.16.0-202408120337.p0.g48d1049.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: sriov-network-webhook
This PR has been included in build sriov-network-webhook-container-v4.16.0-202408120337.p0.g48d1049.assembly.stream.el9.
All builds following this will include this PR.

@SchSeba
Copy link
Contributor

SchSeba commented Aug 13, 2024

/cherry-pick release-4.15

@SchSeba
Copy link
Contributor

SchSeba commented Aug 13, 2024

/cherrypick release-4.15

@openshift-cherrypick-robot

@SchSeba: #980 failed to apply on top of branch "release-4.15":

Applying: implement RemovePfAppliedStatus function in store
Applying: Remove store file on reset
Applying: Skip firmware reset for devices we don't control
Applying: implement functional test for both regular and externally manage
Using index info to reconstruct a base tree...
M	test/conformance/tests/test_sriov_operator.go
Falling back to patching base and 3-way merge...
Auto-merging test/conformance/tests/test_sriov_operator.go
CONFLICT (content): Merge conflict in test/conformance/tests/test_sriov_operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 implement functional test for both regular and externally manage
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:

/cherry-pick release-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

@SchSeba: #980 failed to apply on top of branch "release-4.15":

Applying: implement RemovePfAppliedStatus function in store
Applying: Remove store file on reset
Applying: Skip firmware reset for devices we don't control
Applying: implement functional test for both regular and externally manage
Using index info to reconstruct a base tree...
M	test/conformance/tests/test_sriov_operator.go
Falling back to patching base and 3-way merge...
Auto-merging test/conformance/tests/test_sriov_operator.go
CONFLICT (content): Merge conflict in test/conformance/tests/test_sriov_operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 implement functional test for both regular and externally manage
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 release-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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.