Closed zeeke closed 3 months ago
/jira cherrypick OCPBUGS-36683
@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
@zeeke: This pull request references Jira Issue OCPBUGS-38010, which is invalid:
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.
@zeeke: all tests passed!
Full PR test history. Your PR dashboard.
/jira refresh
@SchSeba: This pull request references Jira Issue OCPBUGS-38010, which is valid.
No GitHub users were found matching the public email listed for the QA contact in Jira (elevin@redhat.com), skipping review request.
/lgtm /approve /label backport-risk-assessed
[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
/label cherry-pick-approved
@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.
[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.
[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.
[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.
/cherry-pick release-4.15
/cherrypick release-4.15
@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".
@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".
4.16 Backport of
no conflicts
This should fix the failing test
cc @SchSeba