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.

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

Jump to bottom

🌱 test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout #3061

Merged
merged 1 commit into from
Jun 17, 2024
Merged

🌱 test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout #3061

merged 1 commit into from
Jun 17, 2024

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

This speeds up the K8s-Upgrade tests by changing the rolloutStrategy for MachineDeployments in the used install-on-bootstrap flavor.

This test uses 5 replicas for the machine deployment which makes the test currently flaky by reaching the 15mins timeout.

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 #

@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 14, 2024
@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main
  • /test pull-cluster-api-provider-vsphere-janitor-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
  • pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test help

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.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 14, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main

@chrischdi
Copy link
Member Author

/cherry-pick release-1.10

@chrischdi chrischdi closed this Jun 14, 2024
@k8s-infra-cherrypick-robot
Copy link

@chrischdi: cannot cherry-pick an unmerged PR

In response to this:

/cherry-pick release-1.10

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.

@chrischdi chrischdi reopened this Jun 14, 2024
@chrischdi
Copy link
Member Author

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot
Copy link

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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.

@chrischdi
Copy link
Member Author

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot
Copy link

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.9

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.

@chrischdi
Copy link
Member Author

/retest

(due to accidentially closing and reopening the issue)

@sbueringer
Copy link
Member

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main

@sbueringer
Copy link
Member

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 83f164102301f950cfab998cbcd167f7cd6a6958

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

Let's do a quick comparison on job durations afterwards

@chrischdi
Copy link
Member Author

/hold

for the following already on the PR jobs:

Let's do a quick comparison on job durations afterwards

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 14, 2024
@chrischdi chrischdi changed the title 🌱 test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout 🌱 [WIP] test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout Jun 14, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main

@chrischdi chrischdi force-pushed the pr-test-install-bootstrap-rolloutstrategy branch from 7738bc2 to 5205aa7 Compare June 17, 2024 07:22
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 17, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main

@chrischdi chrischdi changed the title 🌱 [WIP] test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout 🌱 test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout Jun 17, 2024
@chrischdi chrischdi force-pushed the pr-test-install-bootstrap-rolloutstrategy branch from 5205aa7 to 8294c0e Compare June 17, 2024 09:26
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main

@chrischdi
Copy link
Member Author

/retest

unrelated flake

@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: eb189ded6ebbd21d3bc8730478981996294062dd

@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

@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2024
@k8s-ci-robot k8s-ci-robot merged commit 6a680b2 into kubernetes-sigs:main Jun 17, 2024
17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jun 17, 2024
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 17, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link

@chrischdi: new pull request created: #3064

In response to this:

/cherry-pick release-1.10

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.

@k8s-infra-cherrypick-robot
Copy link

@chrischdi: #3061 failed to apply on top of branch "release-1.9":

Applying: test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout
Using index info to reconstruct a base tree...
A	test/e2e/config/vsphere.yaml
A	test/e2e/data/infrastructure-vsphere-govmomi/main/install-on-bootstrap/kustomization.yaml
A	test/e2e/data/infrastructure-vsphere-supervisor/main/install-on-bootstrap/kustomization.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/data/infrastructure-vsphere/v1.7/workload/kustomization.yaml
CONFLICT (content): Merge conflict in test/e2e/data/infrastructure-vsphere/v1.7/workload/kustomization.yaml
CONFLICT (modify/delete): test/e2e/config/vsphere.yaml deleted in HEAD and modified in test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout. Version test: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout of test/e2e/config/vsphere.yaml left in tree.
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: use rolloutStrategy to speed up K8s-Upgrade tests to not hit rollout timeout
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.9

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.

@sbueringer
Copy link
Member

@chrischdi Can you please open a manual cherry-pick for 1.9?

I think we don't need one for older branches because install-on-bootstrap was introduced in 1.9

@chrischdi chrischdi mentioned this pull request Jun 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srm09 srm09 Awaiting requested review from srm09

@zhanggbj zhanggbj Awaiting requested review from zhanggbj

@sbueringer sbueringer Awaiting requested review from sbueringer

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.
4 participants
@chrischdi @k8s-ci-robot @k8s-infra-cherrypick-robot @sbueringer