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

NO-JIRA: e2e: testdata: remove the annotated profile #962

Closed ffromani closed 8 months ago

ffromani commented 9 months ago

after #951 merged, we don't need these anymore

ffromani commented 9 months ago

/retest-required

ffromani commented 9 months ago

/label acknowledge-critical-fixes-only

removing unused testdata can't break the payload

openshift-ci[bot] commented 9 months ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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/master/OWNERS)~~ [ffromani,jmencak] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jmencak commented 9 months ago

/retest

ffromani commented 9 months ago

/test e2e-hypershift

openshift-ci-robot commented 9 months ago

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

In response to [this](https://github.com/openshift/cluster-node-tuning-operator/pull/962): >after #951 merged, we don't need these anymore 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 9 months ago

/retest-required

Remaining retests: 0 against base HEAD 631e03c6c535f7254e675706a3eca318dbac7c2a and 2 for PR HEAD 1caac62a9aba6bad6ab1a1811a99363808846647 in total

openshift-ci-robot commented 9 months ago

/retest-required

Remaining retests: 0 against base HEAD 19686cd969404eca0bf09f9c991a8e7bd7ea0ad2 and 1 for PR HEAD 1caac62a9aba6bad6ab1a1811a99363808846647 in total

ffromani commented 9 months ago

/retest-required

ffromani commented 9 months ago

infra issue (failing during the setup stage, test data or lack thereof cannot possibly be relevant)

openshift-ci-robot commented 9 months ago

/retest-required

Remaining retests: 0 against base HEAD e7ff8d51a30debf36d36c6acfa02d6ab85f1ff3c and 0 for PR HEAD 1caac62a9aba6bad6ab1a1811a99363808846647 in total

openshift-ci-robot commented 9 months ago

/hold

Revision 1caac62a9aba6bad6ab1a1811a99363808846647 was retested 3 times: holding

yanirq commented 9 months ago

/retest

yanirq commented 8 months ago

/retest

yanirq commented 8 months ago

/hold cancel

openshift-ci-robot commented 8 months ago

/retest-required

Remaining retests: 0 against base HEAD 28bebe3a9511a4f8234b81fef7d501ab415cd9e2 and 2 for PR HEAD 1caac62a9aba6bad6ab1a1811a99363808846647 in total

yanirq commented 8 months ago

/retest

yanirq commented 8 months ago

/retest-required

yanirq commented 8 months ago

/retest

yanirq commented 8 months ago

/retest-required

yanirq commented 8 months ago

/retest

yanirq commented 8 months ago

/lgtm

openshift-ci-robot commented 8 months ago

/retest-required

Remaining retests: 0 against base HEAD 28bebe3a9511a4f8234b81fef7d501ab415cd9e2 and 2 for PR HEAD 2af25a7861cecb486f0b1019612b60f018658408 in total

yanirq commented 8 months ago

/retest-required

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).
yanirq commented 8 months ago

/cherry-pick release-4.15

openshift-cherrypick-robot commented 8 months ago

@yanirq: #962 failed to apply on top of branch "release-4.15":

Applying: e2e: testdata: remove the annotated profile
Using index info to reconstruct a base tree...
A   test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/default/manual_annotated.yaml
A   test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_annotated.yaml
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_annotated.yaml deleted in e2e: testdata: remove the annotated profile and renamed to test/e2e/performanceprofile/cluster-setup/manual-cluster/performance/performance_profile.yaml in HEAD. Version HEAD of test/e2e/performanceprofile/cluster-setup/manual-cluster/performance/performance_profile.yaml left in tree.
CONFLICT (rename/delete): test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_annotated.yaml deleted in e2e: testdata: remove the annotated profile and renamed to test/e2e/performanceprofile/cluster-setup/bootstrap-cluster/performance/pao_worker.yaml in HEAD. Version HEAD of test/e2e/performanceprofile/cluster-setup/bootstrap-cluster/performance/pao_worker.yaml left in tree.
CONFLICT (rename/delete): test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_annotated.yaml deleted in e2e: testdata: remove the annotated profile and renamed to test/e2e/performanceprofile/cluster-setup/bootstrap-cluster/performance/pao_master.yaml in HEAD. Version HEAD of test/e2e/performanceprofile/cluster-setup/bootstrap-cluster/performance/pao_master.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 e2e: testdata: remove the annotated profile
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/962#issuecomment-1980291000): >/cherry-pick release-4.15 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

cherry-pick not needed as changes are already incorporated in #963