Skip to content

OCPBUGS-48317: PPC_Test_fix: use ROLE_WORKER_CNF environment variable to determine mcp name #1261

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

Merged
merged 1 commit into from
Jan 15, 2025
Merged

OCPBUGS-48317: PPC_Test_fix: use ROLE_WORKER_CNF environment variable to determine mcp name #1261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions test/e2e/performanceprofile/functests/10_performance_ppc/ppc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func PPCTestCreateUtil() *PPCTestIntegration {

var _ = Describe("[rfe_id: 38968] PerformanceProfile setup helper and platform awareness", Label(string(label.PerformanceProfileCreator)), func() {
mustgatherDir := testutils.MustGatherDir
mcpName := testutils.RoleWorkerCNF
ntoImage := testutils.NTOImage
Context("PPC Sanity Tests", Label(string(label.Tier0)), func() {
ppcIntgTest := PPCTestCreateUtil()
Expand All @@ -79,7 +80,7 @@ var _ = Describe("[rfe_id: 38968] PerformanceProfile setup helper and platform a
cmdArgs := []string{
fmt.Sprintf("%s:%s:z", mustgatherDir, mustgatherDir),
ntoImage,
"--mcp-name=worker",
fmt.Sprintf("--mcp-name=%s", mcpName),
Comment on lines -82 to +83
Copy link
Contributor

Choose a reason for hiding this comment

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

by default (in case the env variable isn't set) the target mcp would be worker-cnf, see here:
https://github.com/openshift/cluster-node-tuning-operator/blob/master/test/e2e/performanceprofile/functests/utils/consts.go#L38
does that make any difference in the expected results? is the gathered data have both mcps?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so when running under SNO environment we want to set ROLE_WORKER_CNF=master and run the tests

Copy link
Contributor

Choose a reason for hiding this comment

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

the change then solves SNO perfectly; what about MNO , do we always have worker-cnf mcp in the env from which we gathered the must-gather?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so in our CI for MNO , our CI creates a must-gather before running PPC tests, and by default we have worker-cnf label set.

fmt.Sprintf("--reserved-cpu-count=%d", reservedCpuCount),
fmt.Sprintf("--rt-kernel=%t", true),
fmt.Sprintf("--power-consumption-mode=%s", "low-latency"),
Expand Down Expand Up @@ -111,7 +112,7 @@ var _ = Describe("[rfe_id: 38968] PerformanceProfile setup helper and platform a
cmdArgs := []string{
fmt.Sprintf("%s:%s:z", mustgatherDir, mustgatherDir),
ntoImage,
"--mcp-name=worker",
fmt.Sprintf("--mcp-name=%s", mcpName),
fmt.Sprintf("--reserved-cpu-count=%d", 2),
fmt.Sprintf("--rt-kernel=%t", true),
fmt.Sprintf("--power-consumption-mode=%s", "low-latency"),
Expand Down Expand Up @@ -142,7 +143,7 @@ var _ = Describe("[rfe_id: 38968] PerformanceProfile setup helper and platform a
cmdArgs := []string{
fmt.Sprintf("%s:%s:z", mustgatherDir, mustgatherDir),
ntoImage,
"--mcp-name=worker",
fmt.Sprintf("--mcp-name=%s", mcpName),
fmt.Sprintf("--reserved-cpu-count=%d", 2),
fmt.Sprintf("--rt-kernel=%t", true),
fmt.Sprintf("--power-consumption-mode=%s", "low-latency"),
Expand Down Expand Up @@ -172,7 +173,7 @@ var _ = Describe("[rfe_id: 38968] PerformanceProfile setup helper and platform a
cmdArgs := []string{
fmt.Sprintf("%s:%s:z", mustgatherDir, mustgatherDir),
ntoImage,
"--mcp-name=worker",
fmt.Sprintf("--mcp-name=%s", mcpName),
fmt.Sprintf("--reserved-cpu-count=%d", 100),
fmt.Sprintf("--rt-kernel=%t", true),
fmt.Sprintf("--power-consumption-mode=%s", "low-latency"),
Expand Down