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

🌱 test: fix machinepool test to wait for topology controller to set correct number of replicas first #10952

Merged

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

I did hit this locally:
I had a case where 3 healthy machine pool machines did exist, but the test expected two while it must be three.

The topology controller may require some time to rollout the change to the MachinePool object.
This ensures we get the right state of the machine pool object to continue checking the right amount of ready replicas.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/area e2e-testing

@k8s-ci-robot k8s-ci-robot added area/e2e-testing Issues or PRs related to e2e testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 29, 2024
@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

/test pull-cluster-api-e2e-main

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 0a77809f988f843fec654c4955a6b43b11c414e6

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2024
@chrischdi
Copy link
Member Author

/retest

Webhook flake, unrelated

@k8s-ci-robot k8s-ci-robot merged commit eba0375 into kubernetes-sigs:main Jul 29, 2024
23 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Jul 29, 2024
@chrischdi
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@chrischdi: #10952 failed to apply on top of branch "release-1.7":

Applying: test: fix machinepool test to wait for topology controller to set correct number of replicas first
Using index info to reconstruct a base tree...
M	test/framework/machinepool_helpers.go
M	test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
Auto-merging test/framework/machinepool_helpers.go
CONFLICT (content): Merge conflict in test/framework/machinepool_helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test: fix machinepool test to wait for topology controller to set correct number of replicas first
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-1.7

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.

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. area/e2e-testing Issues or PRs related to e2e testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants