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.

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

OCPBUGS-31694: E2E: Workload hints test cases fixes #1012

Merged
merged 2 commits into from Apr 15, 2024

Conversation

mrniranjan
Copy link
Contributor

No description provided.

@mrniranjan
Copy link
Contributor Author

/test e2e-gcp-pao-updating-profile

@mrniranjan mrniranjan changed the title E2E: Workload hints test cases fixes OCPBUGS-31694: E2E: Workload hints test cases fixes Apr 3, 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 Apr 3, 2024
@openshift-ci-robot
Copy link
Contributor

@mrniranjan: This pull request references Jira Issue OCPBUGS-31694, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

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:

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.

… stuck

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>
@mrniranjan
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 3, 2024
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

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

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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 3, 2024
@openshift-ci openshift-ci bot requested a review from gsr-shanks April 3, 2024 12:27
Copy link
Contributor

@ffromani ffromani left a comment

Choose a reason for hiding this comment

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

/approve

LGTM once a inline question is addressed

@@ -258,28 +259,32 @@ var _ = Describe("[rfe_id:49062][workloadHints] Telco friendly workload specific

When("realtime and high power consumption enabled", func() {
It("[test_id:50993][crit:high][vendor:cnf-qe@redhat.com][level:acceptance]should update kernel arguments and tuned accordingly", func() {
currentWorkloadHints := profile.Spec.WorkloadHints
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need a DeepCopy() here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean should we DeepCopy() ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here, i only intend to get the current profile before i modify, to check if the current profile is already contains the changes i intend to make further, if the current profile already contains the changes needed, then don't need to apply the spec changes , directly check the tuning parameters.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The reason we need this in Downstream we already have performance profile created before test runs and in the performance profile highPowerConsumption and realTime workload hints are already set to True, with this profile when this test runs, where we are setting these to true , the mcp is hung because there is nothing to change and test timesout waiting on mcp update.

this patch addresses this issue by getting the current workloadhints and if they are same skip the mcp update and test the tunings.

@@ -320,27 +325,29 @@ var _ = Describe("[rfe_id:49062][workloadHints] Telco friendly workload specific

When("perPodPowerManagent enabled", func() {
It("[test_id:54177]should update kernel arguments and tuned accordingly", func() {
currentWorkloadHints := profile.Spec.WorkloadHints
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto: do we need a DeepCopy() here?

Copy link
Contributor

openshift-ci bot commented Apr 5, 2024

[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

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 Apr 5, 2024
Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>
Copy link
Contributor

@ffromani ffromani 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 Apr 15, 2024
Copy link
Contributor

openshift-ci bot commented Apr 15, 2024

@mrniranjan: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 0d90b86 into openshift:master Apr 15, 2024
16 checks passed
@openshift-ci-robot
Copy link
Contributor

@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.

In response to this:

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-bot
Copy link
Contributor

[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.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-04-16-015315

@mrniranjan
Copy link
Contributor Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@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".

In response to this:

/cherry-pick 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/test-infra repository.

mrniranjan added a commit to mrniranjan/cluster-node-tuning-operator that referenced this pull request Apr 23, 2024
* compare existing profile with changes being made to avoid mcp getting stuck

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>

* Extend the comparing the of workloadhints to few more test cases

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>

---------

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>
Co-authored-by: Niranjan M.R <mrniranjan@redhat.com>
mrniranjan added a commit to mrniranjan/cluster-node-tuning-operator that referenced this pull request Apr 23, 2024
* compare existing profile with changes being made to avoid mcp getting stuck

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>

* Extend the comparing the of workloadhints to few more test cases

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>

---------

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>
Co-authored-by: Niranjan M.R <mrniranjan@redhat.com>
openshift-merge-bot bot pushed a commit that referenced this pull request Apr 30, 2024
* compare existing profile with changes being made to avoid mcp getting stuck



* Extend the comparing the of workloadhints to few more test cases



---------

Signed-off-by: Niranjan M.R <mrniranjan@redhat.com>
Co-authored-by: Niranjan M.R <mrniranjan@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants