Closed openshift-cherrypick-robot closed 2 months ago
@openshift-cherrypick-robot: Jira Issue OCPBUGS-39124 has been cloned as Jira Issue OCPBUGS-42061. Will retitle bug to link to clone. /retitle [release-4.16] OCPBUGS-42061: Add cluster-wide proxy env file
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-42061, 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
@jmencak: This pull request references Jira Issue OCPBUGS-42061, 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.
/retest /jira refresh /approve /lgtm
@jmencak: This pull request references Jira Issue OCPBUGS-42061, which is valid. The bug has been moved to the POST state.
No GitHub users were found matching the public email listed for the QA contact in Jira (liqcui@redhat.com), skipping review request.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: jmencak, openshift-cherrypick-robot
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/label backport-risk-assessed @liqcui Can we please have cherry-pick-approved label for this? Thank you!
label cherry-pick-approved
/label cherry-pick-approved
@openshift-cherrypick-robot: all tests passed!
Full PR test history. Your PR dashboard.
@openshift-cherrypick-robot: Jira Issue OCPBUGS-42061: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-42061 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
Distgit: cluster-node-tuning-operator This PR has been included in build cluster-node-tuning-operator-container-v4.16.0-202409211105.p0.g57a7145.assembly.stream.el9. All builds following this will include this PR.
/cherry-pick release-4.15
@jmencak: #1166 failed to apply on top of branch "release-4.15":
Applying: OCPBUGS-39005: Add cluster-wide proxy env file
Using index info to reconstruct a base tree...
A test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml deleted in HEAD and modified in OCPBUGS-39005: Add cluster-wide proxy env file. Version OCPBUGS-39005: Add cluster-wide proxy env file of test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml left in tree.
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-39005: Add cluster-wide proxy env file
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".
This is an automated cherry-pick of #1145
/assign jmencak