search

openshift / sriov-network-operator

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

OCPBUGS-23795: Downstream merge Sync/20240822 #992

Closed zeeke closed 3 months ago

zeeke commented 3 months ago

Downstream sync PR via git merge. Relevant commit is:

All other commits appears here because the previous sync had modified the history:

openshift-ci-robot commented 3 months ago

@zeeke: This pull request references Jira Issue OCPBUGS-23795, 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/992): >Downstream sync PR via `git merge`. Relevant commit is: >- 1183e4f40949ef7ad05007e4e6abe424a1c9ed1d > >All other commits appears here because the previous sync had modified the history: >- https://github.com/openshift/sriov-network-operator/pull/990 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[bot] commented 3 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/master/OWNERS)~~ [SchSeba,zeeke] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
zeeke commented 3 months ago

/test e2e-telco5g-sriov

SchSeba commented 3 months ago

/hold

lets give time for the CI to run

zeeke commented 3 months ago

/jira refresh

openshift-ci-robot commented 3 months ago

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

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.18.0) matches configured target version for branch (4.18.0) * bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @dgonyier

In response to [this](https://github.com/openshift/sriov-network-operator/pull/992#issuecomment-2304850812): >/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[bot] commented 3 months ago

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: dgonyier.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to [this](https://github.com/openshift/sriov-network-operator/pull/992#issuecomment-2304851076): >@zeeke: This pull request references [Jira Issue OCPBUGS-23795](https://issues.redhat.com//browse/OCPBUGS-23795), which is valid. The bug has been moved to the POST state. > >
3 validation(s) were run on this bug > >* bug is open, matching expected state (open) >* bug target version (4.18.0) matches configured target version for branch (4.18.0) >* bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @dgonyier

In response to [this](https://github.com/openshift/sriov-network-operator/pull/992#issuecomment-2304850812): >/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.

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-ci[bot] commented 3 months ago

@zeeke: The following tests 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-telco5g-sriov d436b3b231a9c50c69a9391812639a9bd4a333f5 link false /test e2e-telco5g-sriov
ci/prow/e2e-openstack-nfv d436b3b231a9c50c69a9391812639a9bd4a333f5 link false /test e2e-openstack-nfv
ci/prow/e2e-openstack-nfv-hwoffload d436b3b231a9c50c69a9391812639a9bd4a333f5 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 3 months ago

ci/prow/e2e-telco5g-sriov job fails to rebase this PR on master. 

+ [[ -n 992 ]]
+ [[ sriov-network-operator == \s\r\i\o\v\-\n\e\t\w\o\r\k\-\o\p\e\r\a\t\o\r ]]
+ git fetch upstream pull/992/head
From https://github.com/openshift/sriov-network-operator
 * branch                refs/pull/992/head -> FETCH_HEAD
+ git checkout -b pr-992 FETCH_HEAD
Switched to a new branch 'pr-992'
+ git pull --rebase upstream master
From https://github.com/openshift/sriov-network-operator
 * branch                master     -> FETCH_HEAD
Rebasing (1/9)
dropping f8cc3364c9a16d42a6669[68](https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_sriov-network-operator/992/pull-ci-openshift-sriov-network-operator-master-e2e-telco5g-sriov/1826617492148064256#1:build-log.txt%3A68)dff90dbfbf7219260 Remove logic that installs rdma-core package -- patch contents already upstream
Rebasing (2/9)
Auto-merging bindata/manifests/daemon/daemonset.yaml
CONFLICT (content): Merge conflict in bindata/manifests/daemon/daemonset.yaml
Auto-merging bindata/manifests/operator-webhook/server.yaml
Auto-merging bindata/manifests/webhook/server.yaml
Auto-merging config/manager/manager.yaml
CONFLICT (content): Merge conflict in config/manager/manager.yaml
Auto-merging deploy/operator.yaml
Auto-merging deployment/sriov-network-operator-chart/templates/operator.yaml
error: could not apply 7c592c52f... manifests: set required-scc for openshift workloads
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7c5[92](https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_sriov-network-operator/992/pull-ci-openshift-sriov-network-operator-master-e2e-telco5g-sriov/1826617492148064256#1:build-log.txt%3A92)c52f... manifests: set required-scc for openshift workloads

Merging this as there is no quick way to make that rebase work (this PR is merging some already cherry-picked commits). I'm going to propose a fix in the openshift/release repo to avoid rebasing. It would be also good to avoid building the operator again and use CI promoted images.

/hold cancel

openshift-ci-robot commented 3 months ago

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

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

In response to [this](https://github.com/openshift/sriov-network-operator/pull/992): >Downstream sync PR via `git merge`. Relevant commit is: >- 1183e4f40949ef7ad05007e4e6abe424a1c9ed1d > >All other commits appears here because the previous sync had modified the history: >- https://github.com/openshift/sriov-network-operator/pull/990 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-bot commented 3 months ago

[ART PR BUILD NOTIFIER]

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

openshift-bot commented 3 months ago

[ART PR BUILD NOTIFIER]

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

openshift-bot commented 3 months ago

[ART PR BUILD NOTIFIER]

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