search

openshift / cluster-node-tuning-operator

Manage node-level tuning by orchestrating the tuned daemon.
Apache License 2.0
102 stars 105 forks source link

OCPBUGS-31042: [release-4.15][manual] hack: fix backport of render-sync.sh #996

Closed ffromani closed 8 months ago

ffromani commented 8 months ago

Missed hunk to update the no-ref testdata in PRs #966 #989

openshift-ci-robot commented 8 months ago

@ffromani: This pull request explicitly references no jira issue.

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996): >Missed hunk to update the no-ref testdata in PRs #966 #989 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-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.
ffromani commented 8 months ago

xref: #994

openshift-ci[bot] commented 8 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani, MarSik

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/cluster-node-tuning-operator/blob/release-4.15/OWNERS)~~ [MarSik,ffromani] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
yanirq commented 8 months ago

/lgtm

rbaturov commented 8 months ago

/lgtm

shajmakh commented 8 months ago

/label cherry-pick-approved

openshift-ci[bot] commented 8 months ago

@ffromani: all tests passed!

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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
ffromani commented 8 months ago

/cherry-pick release-4.14

openshift-cherrypick-robot commented 8 months ago

@ffromani: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996#issuecomment-2003687400): >/cherry-pick release-4.14 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ffromani commented 8 months ago

/jira refresh

openshift-ci-robot commented 8 months ago

@ffromani: This pull request explicitly references no jira issue.

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996#issuecomment-2003693311): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-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.
yanirq commented 8 months ago

/label backport-risk-assessed

openshift-ci-robot commented 8 months ago

@ffromani: This pull request references Jira Issue OCPBUGS-31042, 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/cluster-node-tuning-operator/pull/996): >Missed hunk to update the no-ref testdata in PRs #966 #989 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-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.
ffromani commented 8 months ago

/jira refresh

openshift-ci-robot commented 8 months ago

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

6 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.15.z) matches configured target version for branch (4.15.z) * bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST) * dependent bug [Jira Issue OCPBUGS-31043](https://issues.redhat.com//browse/OCPBUGS-31043) is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-31043](https://issues.redhat.com//browse/OCPBUGS-31043) targets the "4.16.0" version, which is one of the valid target versions: 4.16.0 * bug has dependents

Requesting review from QA contact: /cc @gsr-shanks

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996#issuecomment-2006917636): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-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-robot commented 8 months ago

@ffromani: Jira Issue OCPBUGS-31042: All pull requests linked via external trackers have merged:

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

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996): >Missed hunk to update the no-ref testdata in PRs #966 #989 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-node-tuning-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-cherrypick-robot commented 8 months ago

@ffromani: #996 failed to apply on top of branch "release-4.14":

Applying: hack: fix backport of render-sync.sh
Using index info to reconstruct a base tree...
M   hack/render-sync.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/render-sync.sh
CONFLICT (content): Merge conflict in hack/render-sync.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 hack: fix backport of render-sync.sh
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".
In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/996#issuecomment-2003687400): >/cherry-pick release-4.14 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 8 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-node-tuning-operator-container-v4.15.0-202403191840.p0.g948f093.assembly.stream.el9 for distgit cluster-node-tuning-operator. All builds following this will include this PR.