search

openshift / sriov-network-operator

SR-IOV Network Operator
Apache License 2.0
119 stars 106 forks source link

OCPBUGS-36734,OCPBUGS-36733,OCPBUGS-36731,OCPBUGS-36730: 4.15 critical bugs #954

Closed zeeke closed 4 months ago

zeeke commented 4 months ago

4.15 Backport of:

cc @SchSeba, @mlguerrero12

zeeke commented 4 months ago

/hold

waiting for

Link the correct jira backports before merging

SchSeba commented 4 months ago

Hi @zeeke please remove the func test for mtu that is only for 4.16+ everything else looks good :)

openshift-ci[bot] commented 4 months ago

@zeeke: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-openstack-nfv-hwoffload 9c27b3f1db84e30c22a2980fcc7acd57380d2f58 link false /test e2e-openstack-nfv-hwoffload

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
zeeke commented 4 months ago

/jira cherrypick OCPBUGS-36507

openshift-ci-robot commented 4 months ago

@zeeke: Jira Issue OCPBUGS-36507 has been cloned as Jira Issue OCPBUGS-36730. Will retitle bug to link to clone. /retitle OCPBUGS-36730: 4.15 critical bugs

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217116771): >/jira cherrypick OCPBUGS-36507 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/jira cherrypick OCPBUGS-36308

openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36730, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

@zeeke: Jira Issue OCPBUGS-36308 has been cloned as Jira Issue OCPBUGS-36731. Will retitle bug to link to clone. /retitle OCPBUGS-36731: OCPBUGS-36730: 4.15 critical bugs

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217117563): >/jira cherrypick OCPBUGS-36308 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36731, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36308](https://issues.redhat.com//browse/OCPBUGS-36308) 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-36308](https://issues.redhat.com//browse/OCPBUGS-36308) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/jira cherrypick OCPBUGS-36307

openshift-ci-robot commented 4 months ago

@zeeke: Jira Issue OCPBUGS-36307 has been cloned as Jira Issue OCPBUGS-36733. Will retitle bug to link to clone. /retitle OCPBUGS-36733: OCPBUGS-36731: OCPBUGS-36730: 4.15 critical bugs

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217119945): >/jira cherrypick OCPBUGS-36307 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36733, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/jira cherrypick OCPBUGS-36509

openshift-ci-robot commented 4 months ago

@zeeke: Jira Issue OCPBUGS-36509 has been cloned as Jira Issue OCPBUGS-36734. Will retitle bug to link to clone. /retitle OCPBUGS-36734: OCPBUGS-36733: OCPBUGS-36731: OCPBUGS-36730: 4.15 critical bugs

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217121311): >/jira cherrypick OCPBUGS-36509 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/jira refresh

openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36734, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36734, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217122554): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/retitle OCPBUGS-36734,OCPBUGS-36733,OCPBUGS-36731,OCPBUGS-36730: 4.15 critical bugs

zeeke commented 4 months ago

/jira refresh

openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36734, 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.

This pull request references Jira Issue OCPBUGS-36733, 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.

This pull request references Jira Issue OCPBUGS-36731, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36308](https://issues.redhat.com//browse/OCPBUGS-36308) 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-36308](https://issues.redhat.com//browse/OCPBUGS-36308) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

The bug has been updated to refer to the pull request using the external bug tracker.

This pull request references Jira Issue OCPBUGS-36730, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36734, 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.

This pull request references Jira Issue OCPBUGS-36733, 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.

This pull request references Jira Issue OCPBUGS-36731, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36308](https://issues.redhat.com//browse/OCPBUGS-36308) 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-36308](https://issues.redhat.com//browse/OCPBUGS-36308) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

This pull request references Jira Issue OCPBUGS-36730, 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.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217125287): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/unhlod

SchSeba commented 4 months ago

/lgtm /approve /label backport-risk-assessed

openshift-ci[bot] commented 4 months ago

[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: - ~~[OWNERS](https://github.com/openshift/sriov-network-operator/blob/release-4.15/OWNERS)~~ [SchSeba] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
ajaggapa commented 4 months ago

/label cherry-pick-approved

zeeke commented 4 months ago

/hold cancel /jira refresh

openshift-ci-robot commented 4 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-36734, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36509](https://issues.redhat.com//browse/OCPBUGS-36509) 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-36509](https://issues.redhat.com//browse/OCPBUGS-36509) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

This pull request references Jira Issue OCPBUGS-36733, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36307](https://issues.redhat.com//browse/OCPBUGS-36307) 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-36307](https://issues.redhat.com//browse/OCPBUGS-36307) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

This pull request references Jira Issue OCPBUGS-36731, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36308](https://issues.redhat.com//browse/OCPBUGS-36308) 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-36308](https://issues.redhat.com//browse/OCPBUGS-36308) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

This pull request references Jira Issue OCPBUGS-36730, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36507](https://issues.redhat.com//browse/OCPBUGS-36507) 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-36507](https://issues.redhat.com//browse/OCPBUGS-36507) targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z * bug has dependents

Requesting review from QA contact: /cc @zhaozhanqi

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217494049): >/hold cancel >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 4 months ago

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

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

Jira Issue OCPBUGS-36733: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-36731: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-36730: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/sriov-network-operator/pull/954): >4.15 Backport of: >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/711 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/721 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/530 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/700 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/699 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/710 >- https://github.com/k8snetworkplumbingwg/sriov-network-operator/pull/720 > >cc @SchSeba, @mlguerrero12 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fsriov-network-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zeeke commented 4 months ago

/cherrypick release-4.14

openshift-cherrypick-robot commented 4 months ago

@zeeke: #954 failed to apply on top of branch "release-4.14":

Applying: Remove LastState parameter of GenericPlugin
Applying: Verify status changes on managed interfaces
Applying: Add e2e test for reconciliation when status changes
Applying: Abstract logic to check and load missing KArgs
Applying: Avoid reconciling field `Webhook.ClientConfig.CABundle`
Applying: add sort for the policy on the sriovOperatorConfig controller
Applying: Fix issue with infinite reconciling higher MTU
Applying: Avoid reconfiguring unmentioned DPDK VFs
Applying: Use interface index instead of name
Applying: d/s: run `make deps-update`
.git/rebase-apply/patch:3018: trailing whitespace.

.git/rebase-apply/patch:3018: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
Falling back to patching base and 3-way merge...
Removing vendor/golang.org/x/sys/windows/empty.s
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0010 d/s: run `make deps-update`
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](https://github.com/openshift/sriov-network-operator/pull/954#issuecomment-2217508887): >/cherrypick release-4.14 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 4 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build sriov-network-operator-container-v4.15.0-202407091338.p0.g944b717.assembly.stream.el9 for distgit sriov-network-operator. All builds following this will include this PR.