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

🌱 Divide KCPUpgrade E2E test suite #4683

Merged
merged 1 commit into from
May 27, 2021
Merged

🌱 Divide KCPUpgrade E2E test suite #4683

merged 1 commit into from
May 27, 2021

Conversation

tcordeu
Copy link
Contributor

@tcordeu tcordeu commented May 27, 2021

What this PR does / why we need it:
Separate KCP scale in rollout test to improve test parallelization.

Which issue(s) this PR fixes:
Fixes #4672

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 27, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @tcordeu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 27, 2021
@k8s-ci-robot k8s-ci-robot requested review from enxebre and JoelSpeed May 27, 2021 01:57
@jan-est
Copy link
Contributor

jan-est commented May 27, 2021

This looks good to me

@sedefsavas
Copy link

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 27, 2021
fabriziopandini
fabriziopandini requested changes May 27, 2021
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Given that currently KCPUpgradeSpec has three test specs (It predicates) which are equal except for the flavor and the number of control plane machines, I suggest a different approach.

  • Let's have KCPUpgradeSpec with a single It predicate but accepting in input flavor and the number of control plane machines
  • Let's define there Suites (Describe predicates) in /Users/fpandini/go/src/sigs.k8s.io/cluster-api/test/e2e/kcp_upgrade_test.go, with different combinations of flavors and number of control plane machines.

This has two benefits

  • We are removing/avoiding duplication of code.
  • We will get 3 test suites running in parallel (instead of two, one of them with two test specs)

@tcordeu tcordeu force-pushed the e2e_separate_kcp_scale_in branch from 71a789e to 7f964bb Compare May 27, 2021 16:31
@tcordeu tcordeu changed the title 🌱 Separate KCP scale in rollout E2E test 🌱 Divide KCPUpgrade E2E test suite May 27, 2021
@tcordeu
Copy link
Contributor Author

tcordeu commented May 27, 2021

@fabriziopandini I implemented the changes you proposed, please give it a look when you're free!

@tcordeu tcordeu requested a review from fabriziopandini May 27, 2021 16:34
fabriziopandini
fabriziopandini reviewed May 27, 2021
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

nice! thanks for updating the PR!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2021
@fabriziopandini
Copy link
Member

/test pull-cluster-api-test-full-main
To force those test to run

@k8s-ci-robot
Copy link
Contributor

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

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-make-main
  • /test pull-cluster-api-apidiff-main
  • /test pull-cluster-api-verify
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-ipv6-main
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-21-latest-main

Use /test all to run the following jobs:

  • pull-cluster-api-build-main
  • pull-cluster-api-apidiff-main
  • pull-cluster-api-verify
  • pull-cluster-api-test-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-e2e-ipv6-main

In response to this:

/test pull-cluster-api-test-full-main
To force those test to run

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/test-infra repository.

@fabriziopandini
Copy link
Member

/test pull-cluster-api-e2e-full-main

@tcordeu tcordeu force-pushed the e2e_separate_kcp_scale_in branch from 7f964bb to 75a9712 Compare May 27, 2021 21:02
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2021
@tcordeu
Copy link
Contributor Author

tcordeu commented May 27, 2021

Fixed! My bad clusterctl.DefaultFlavor is in fact "" so the Expect was pointless.

@tcordeu
Copy link
Contributor Author

tcordeu commented May 27, 2021

@fabriziopandini can you force a retest?

PD: For the future, can I force it?

@sedefsavas
Copy link

/test pull-cluster-api-test-main

@sedefsavas
Copy link

I will trigger e2e after unit tests pass.

@sedefsavas
Copy link

/test pull-cluster-api-e2e-full-main

You need to be a reviewer to trigger the tests IIRC.

@sedefsavas
Copy link

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2021
CecileRobertMichon
CecileRobertMichon reviewed May 27, 2021
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 May 27, 2021
@k8s-ci-robot k8s-ci-robot merged commit f84d114 into kubernetes-sigs:master May 27, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone May 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@fabriziopandini fabriziopandini fabriziopandini requested changes

@enxebre enxebre Awaiting requested review from enxebre

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@fabriziopandini fabriziopandini

@CecileRobertMichon CecileRobertMichon

@sedefsavas sedefsavas

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v0.4
Development

Successfully merging this pull request may close these issues.

Divide KCP upgrade e2e test into multiple tests
6 participants
@tcordeu @k8s-ci-robot @jan-est @sedefsavas @fabriziopandini @CecileRobertMichon