Skip to content

OCPBUGS-86965: make test 69755 more stable#6127

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
sergiordlr:make_69755_stable
Jun 4, 2026
Merged

OCPBUGS-86965: make test 69755 more stable#6127
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
sergiordlr:make_69755_stable

Conversation

@sergiordlr
Copy link
Copy Markdown
Contributor

@sergiordlr sergiordlr commented Jun 3, 2026

- What I did

Modify the GetMachinesByPhase to poll more frequently and reduce the number of calls to get the right machineset

- How to verify it

The test 69755 should pass

- Description for the changelog

Summary by CodeRabbit

  • Refactor
    • Improved filtering to limit candidates during machine polls, reducing overhead.
    • Shortened polling interval for faster test responsiveness while keeping the same overall timeout and success behavior.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. 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 Jun 3, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@sergiordlr: This pull request references Jira Issue OCPBUGS-86965, which is invalid:

  • expected the bug to target the "5.0.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.

Details

In response to this:

- What I did

Modify the GetMachinesByPhase to poll more frequently and reduce the number of calls to get the right machineset

- How to verify it

The test 69755 should pass

- Description for the changelog

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 3, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 2fd2a6ff-33b8-4350-a695-a4941077c53a

📥 Commits

Reviewing files that changed from the base of the PR and between 9faa40f and 75c9828.

📒 Files selected for processing (1)
  • test/extended-priv/machineset.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • test/extended-priv/machineset.go

Walkthrough

Rewrites MachineSet.GetMachinesByPhase to build a label-scoped MachineList each poll and apply an items filter on .status.phase == "<phase>"; polling interval changed from 3s to 1s (20s timeout unchanged); returns success when at least one matching machine is found.

Changes

Test Helper Refactoring

Layer / File(s) Summary
GetMachinesByPhase filtering optimization
test/extended-priv/machineset.go
GetMachinesByPhase now constructs a label-scoped MachineList each poll and uses SetItemsFilter to select machines whose .status.phase equals the requested phase instead of fetching all machines and iterating. Poll interval reduced from 3s to 1s; timeout remains 20s; success condition unchanged (len(machines) > 0).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

lgtm, approved, jira/valid-bug, jira/severity-moderate

Suggested reviewers

  • yuqi-zhang
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title references OCPBUGS-86965 and mentions making test 69755 more stable, which aligns with the PR's objective to improve test stability through refactoring GetMachinesByPhase to poll more frequently.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The PR modifies only a utility helper file with no Ginkgo test definitions. Test 69755, which uses the refactored function, has a stable, static test name with no dynamic content.
Test Structure And Quality ✅ Passed GetMachinesByPhase has proper 20s timeout; OrFail wrapper includes meaningful failure messages; codebase patterns with defer cleanup and timeouts are correctly applied.
Microshift Test Compatibility ✅ Passed PR does not add new Ginkgo e2e tests. File modified is a test helper utility (machineset.go) with no test definitions, only refactors existing GetMachinesByPhase() method.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo tests added. PR only refactors GetMachinesByPhase() utility method. Test 69755 already exists and is protected for SNO via SkipTestIfWorkersCannotBeScaled().
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only test/extended-priv/machineset.go, a test utility. No deployment manifests, operator code, or scheduling constraints involved.
Ote Binary Stdout Contract ✅ Passed File contains only test helper methods with no process-level code (main, TestMain, BeforeSuite). GetMachinesByPhase makes no stdout writes and uses logger redirected to GinkgoWriter.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added. The PR only refactors existing helper methods in a test utility file. The custom check only applies to new test declarations.
No-Weak-Crypto ✅ Passed PR modifies only test/extended-priv/machineset.go with polling refactoring; no weak crypto, custom crypto, or secret comparisons introduced.
Container-Privileges ✅ Passed PR only modifies test code (test/extended-priv/machineset.go) to refactor GetMachinesByPhase method. No K8s manifests or containers with privileged settings were added or modified.
No-Sensitive-Data-In-Logs ✅ Passed No logging of sensitive data added. GetMachinesByPhase refactoring only processes non-sensitive phase state values with no new log statements.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from djoshy and yuqi-zhang June 3, 2026 09:57
@sergiordlr sergiordlr force-pushed the make_69755_stable branch from 9faa40f to 75c9828 Compare June 3, 2026 10:11
@sergiordlr
Copy link
Copy Markdown
Contributor Author

/verified by @sergiordlr

The test passed in both prow jobs

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@sergiordlr: This PR has been marked as verified by @sergiordlr.

Details

In response to this:

/verified by @sergiordlr

The test passed in both prow jobs

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.

@sergiordlr
Copy link
Copy Markdown
Contributor Author

/test unit

@sergiordlr
Copy link
Copy Markdown
Contributor Author

/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 Jun 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@sergiordlr: This pull request references Jira Issue OCPBUGS-86965, 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 (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
Details

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.

Copy link
Copy Markdown
Member

@isabella-janssen isabella-janssen 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 Jun 4, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen, sergiordlr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Jun 4, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD efc8f51 and 2 for PR HEAD 75c9828 in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 4, 2026

@sergiordlr: all tests passed!

Full PR test history. Your PR dashboard.

Details

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 218530d into openshift:main Jun 4, 2026
17 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@sergiordlr: Jira Issue Verification Checks: Jira Issue OCPBUGS-86965
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-86965 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

- What I did

Modify the GetMachinesByPhase to poll more frequently and reduce the number of calls to get the right machineset

- How to verify it

The test 69755 should pass

- Description for the changelog

Summary by CodeRabbit

  • Refactor
  • Improved filtering to limit candidates during machine polls, reducing overhead.
  • Shortened polling interval for faster test responsiveness while keeping the same overall timeout and success behavior.

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.

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/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants