Closed yanirq closed 8 months ago
@yanirq: This pull request references Jira Issue OCPBUGS-26400, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @shajmakh
The bug has been updated to refer to the pull request using the external bug tracker.
/cc @MarSik
@yanirq: This pull request references Jira Issue OCPBUGS-26400, which is valid.
Requesting review from QA contact: /cc @shajmakh
/retest
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: MarSik, yanirq
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest-required
Remaining retests: 0 against base HEAD 28bebe3a9511a4f8234b81fef7d501ab415cd9e2 and 2 for PR HEAD 4d71ddb827a884f63f55dc3e1f47da1f0ea5c46d in total
/retest
/retest-required
/retest-required
/retest-required
Remaining retests: 0 against base HEAD 829b837e70b428dd076af4f9f44bfeff2cfce697 and 1 for PR HEAD 4d71ddb827a884f63f55dc3e1f47da1f0ea5c46d in total
@yanirq: all tests passed!
Full PR test history. Your PR dashboard.
@yanirq: Jira Issue OCPBUGS-26400: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-26400 has been moved to the MODIFIED state.
/cherry-pick release-4.15
@yanirq: #976 failed to apply on top of branch "release-4.15":
Applying: OCPBUGS-26400: scheduler plugin: ignore IRQs
Using index info to reconstruct a base tree...
M assets/performanceprofile/tuned/openshift-node-performance
A test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_tuned.yaml
A test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_tuned.yaml
M test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml
M test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml
M test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml
M test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml
A test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml
M test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml
A test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/manual_tuned.yaml
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml
CONFLICT (modify/delete): test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml deleted in HEAD and modified in OCPBUGS-26400: scheduler plugin: ignore IRQs. Version OCPBUGS-26400: scheduler plugin: ignore IRQs of test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml left in tree.
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml
Auto-merging test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml
CONFLICT (modify/delete): test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_tuned.yaml deleted in HEAD and modified in OCPBUGS-26400: scheduler plugin: ignore IRQs. Version OCPBUGS-26400: scheduler plugin: ignore IRQs of test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_tuned.yaml left in tree.
CONFLICT (modify/delete): test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_tuned.yaml deleted in HEAD and modified in OCPBUGS-26400: scheduler plugin: ignore IRQs. Version OCPBUGS-26400: scheduler plugin: ignore IRQs of test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_tuned.yaml left in tree.
Auto-merging assets/performanceprofile/tuned/openshift-node-performance
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-26400: scheduler plugin: ignore IRQs
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".
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-node-tuning-operator-container-v4.16.0-202403060709.p0.gfd8262f.assembly.stream.el9 for distgit cluster-node-tuning-operator. All builds following this will include this PR.
Fix included in accepted release 4.16.0-0.nightly-2024-03-06-174829
Set tuned scheduler plugin not to change any IRQ affinities. This overrides the default(true) which is set via the parent cpu partitioning profile.
Utilized https://github.com/redhat-performance/tuned/pull/595