Closed mrniranjan closed 7 months ago
@mrniranjan: This pull request references Jira Issue OCPBUGS-31694, 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
@mrniranjan: This pull request references Jira Issue OCPBUGS-31694, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @gsr-shanks
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: ffromani, mrniranjan
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@mrniranjan: all tests passed!
Full PR test history. Your PR dashboard.
@mrniranjan: Jira Issue OCPBUGS-31694: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-31694 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-node-tuning-operator-container-v4.16.0-202404151450.p0.g0d90b86.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-04-16-015315
/cherry-pick release-4.15
@mrniranjan: #1012 failed to apply on top of branch "release-4.15":
Applying: compare existing profile with changes being made to avoid mcp getting stuck
Using index info to reconstruct a base tree...
M test/e2e/performanceprofile/functests/8_performance_workloadhints/workloadhints.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests/8_performance_workloadhints/workloadhints.go
Applying: Extend the comparing the of workloadhints to few more test cases
Using index info to reconstruct a base tree...
M test/e2e/performanceprofile/functests/8_performance_workloadhints/workloadhints.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests/8_performance_workloadhints/workloadhints.go
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/functests/8_performance_workloadhints/workloadhints.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Extend the comparing the of workloadhints to few more test cases
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".
/test e2e-gcp-pao-updating-profile