Skip to content

OCPBUGS-86965: make test 69755 more stable #6127

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
openshift-merge-bot merged 1 commit into from
Jun 4, 2026
+6 −12
Merged

OCPBUGS-86965: make test 69755 more stable #6127

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
18 changes: 6 additions & 12 deletions test/extended-priv/machineset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,16 @@ func (ms MachineSet) GetMachines() ([]*Machine, error) {

// GetMachinesByPhase get machine by phase e.g. Running, Provisioning, Provisioned, Deleting etc.
func (ms MachineSet) GetMachinesByPhase(phase string) ([]*Machine, error) {
// add poller to check machine phase periodically.
machines := []*Machine{}
pollerr := wait.PollUntilContextTimeout(context.TODO(), 3*time.Second, 20*time.Second, true, func(_ context.Context) (bool, error) {
ml, err := ms.GetMachines()
pollerr := wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, 20*time.Second, true, func(_ context.Context) (bool, error) {
ml := NewMachineList(ms.oc, ms.GetNamespace())
ml.ByLabel("machine.openshift.io/cluster-api-machineset=" + ms.GetName())
ml.SetItemsFilter(fmt.Sprintf(`?(@.status.phase=="%s")`, phase))
allMachines, err := ml.GetAll()
if err != nil {
return false, err
}
for _, m := range ml {
mPhase, err := m.GetPhase()
if err != nil {
return false, err
}
if mPhase == phase {
machines = append(machines, m)
}
}
machines = allMachines
return len(machines) > 0, nil
})

Expand Down