Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-4.17] OCPBUGS-46592: e2e: tuned degraded test fix #1259

Merged
merged 1 commit into from
Jan 14, 2025
Merged

[release-4.17] OCPBUGS-46592: e2e: tuned degraded test fix #1259

merged 1 commit into from
Jan 14, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1250

/assign openshift-cherrypick-robot

/cherrypick release-4.16 release-4.15

@rbaturov
e2e: tuned degraded test fix
5dfcc52 
* Addressed a corner case where nodes based on VMs would always log a warning without verifying if the profile was degraded. This incorrect behavior has been fixed to properly check the profile state before logging warnings.
* Modified isVM func to execute "systemd-detect-virt" command after chroot to rootfs. This will ensures accurate virtualization detection by running the command in the host's context instead of the container.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 18, 2024
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-46036 has been cloned as Jira Issue OCPBUGS-46592. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-46592: e2e: tuned degraded test fix

In response to this:

This is an automated cherry-pick of #1250

/assign openshift-cherrypick-robot

/cherrypick release-4.16 release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.17] OCPBUGS-46036: e2e: tuned degraded test fix [release-4.17] OCPBUGS-46592: e2e: tuned degraded test fix Dec 18, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 18, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-46592, which is invalid:

  • expected dependent Jira Issue OCPBUGS-46036 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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:

This is an automated cherry-pick of #1250

/assign openshift-cherrypick-robot

/cherrypick release-4.16 release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from ffromani and Tal-or December 18, 2024 17:58
@rbaturov
Copy link
Contributor

/test e2e-hypershift

@rbaturov
Copy link
Contributor

/cc @rbaturov

@openshift-ci openshift-ci bot requested a review from rbaturov December 29, 2024 09:01
@Tal-or
Copy link
Contributor

Tal-or commented Dec 30, 2024

LGTM

@mrniranjan
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 30, 2024
@rbaturov
Copy link
Contributor

/cc @rbaturov

swatisehgal
swatisehgal reviewed Jan 3, 2025
View reviewed changes
Copy link
Contributor

@swatisehgal swatisehgal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2025
@swatisehgal
Copy link
Contributor

/assign @MarSik
for approval

@yanirq
Copy link
Contributor

yanirq commented Jan 5, 2025

/approve
/label backport-risk-assessed,

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, yanirq

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 5, 2025
@mrniranjan
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 14, 2025
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-46036 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-46036 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@MarSik
Copy link
Contributor

MarSik commented Jan 14, 2025

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 14, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 6ffc337 and 2 for PR HEAD 5dfcc52 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 14, 2025

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 066848a into openshift:release-4.17 Jan 14, 2025
16 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-46592: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #1250

/assign openshift-cherrypick-robot

/cherrypick release-4.16 release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link
Author

@openshift-cherrypick-robot: #1259 failed to apply on top of branch "release-4.16":

Applying: e2e: tuned degraded test fix
Using index info to reconstruct a base tree...
M	test/e2e/performanceprofile/functests/1_performance/performance.go
M	test/e2e/performanceprofile/functests/utils/infrastructure/vm.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests/utils/infrastructure/vm.go
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/functests/utils/infrastructure/vm.go
Auto-merging test/e2e/performanceprofile/functests/1_performance/performance.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 e2e: tuned degraded test fix

In response to this:

This is an automated cherry-pick of #1250

/assign openshift-cherrypick-robot

/cherrypick release-4.16 release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-node-tuning-operator
This PR has been included in build cluster-node-tuning-operator-container-v4.17.0-202501141505.p0.g066848a.assembly.stream.el9.
All builds following this will include this PR.

@rbaturov rbaturov mentioned this pull request Jan 15, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swatisehgal swatisehgal swatisehgal left review comments

@ffromani ffromani Awaiting requested review from ffromani

@Tal-or Tal-or Awaiting requested review from Tal-or

@rbaturov rbaturov Awaiting requested review from rbaturov

Assignees

@MarSik MarSik

@swatisehgal swatisehgal

@openshift-cherrypick-robot openshift-cherrypick-robot

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@openshift-cherrypick-robot @openshift-ci-robot @rbaturov @Tal-or @mrniranjan @swatisehgal @yanirq @MarSik @openshift-bot