Closed kramaranya closed 2 months ago
@kramaranya: This pull request references Jira Issue OCPBUGS-39400, 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.
/jira refresh
@kramaranya: This pull request references Jira Issue OCPBUGS-39400, which is valid. The bug has been moved to the POST state.
can you please run
make -f Makefile.bundle bundle
and commit related changes? That command will update:
@kramaranya: 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 | 769f128eeb414bcc8510f77b665a79a1529e6d6e | link | false | /test e2e-openstack-nfv-hwoffload |
Full PR test history. Your PR dashboard.
/lgtm /approve /label backport-risk-assessed
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: kramaranya, 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
@kramaranya: Jira Issue OCPBUGS-39400: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-39400 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
Distgit: sriov-network-webhook This PR has been included in build sriov-network-webhook-container-v4.17.0-202409040335.p0.g6ffbccd.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.17.0-202409040335.p0.g6ffbccd.assembly.stream.el9. All builds following this will include this PR.
[ART PR BUILD NOTIFIER]
Distgit: sriov-network-config-daemon This PR has been included in build sriov-network-config-daemon-container-v4.17.0-202409040335.p0.g6ffbccd.assembly.stream.el9. All builds following this will include this PR.
/jira backport release-4.15,release-4.16
@zeeke: The following backport issues have been created:
Queuing cherrypicks to the requested branches to be created after this PR merges: /cherrypick release-4.15 /cherrypick release-4.16
@openshift-ci-robot: #995 failed to apply on top of branch "release-4.15":
Applying: manifests: set required-scc for openshift workloads
Using index info to reconstruct a base tree...
M bindata/manifests/daemon/daemonset.yaml
M bindata/manifests/operator-webhook/server.yaml
M bindata/manifests/webhook/server.yaml
M bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
M config/manager/manager.yaml
M deploy/operator.yaml
A deployment/sriov-network-operator-chart/templates/operator.yaml
M manifests/stable/sriov-network-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/stable/sriov-network-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in manifests/stable/sriov-network-operator.clusterserviceversion.yaml
Auto-merging deployment/sriov-network-operator/templates/operator.yaml
Auto-merging deploy/operator.yaml
Auto-merging config/manager/manager.yaml
Auto-merging bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
Auto-merging bindata/manifests/webhook/server.yaml
Auto-merging bindata/manifests/operator-webhook/server.yaml
Auto-merging bindata/manifests/daemon/daemonset.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 manifests: set required-scc for openshift workloads
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".
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.
OCPBUGS-39400