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

🌱 e2e: Claim ip addresses dynamically so tests can run in parallel #2612

Merged

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Jan 11, 2024

What this PR does / why we need it:

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 #2342

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 11, 2024
Copy link

codecov bot commented Jan 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (02bc12e) 64.91% compared to head (97fec0b) 64.87%.
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2612      +/-   ##
==========================================
- Coverage   64.91%   64.87%   -0.05%     
==========================================
  Files         118      118              
  Lines        8580     8580              
==========================================
- Hits         5570     5566       -4     
- Misses       2584     2587       +3     
- Partials      426      427       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@chrischdi
Copy link
Member Author

/test help

@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-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-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

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-main
  • pull-cluster-api-provider-vsphere-test-integration-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/test-infra repository.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-main

@chrischdi
Copy link
Member Author

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

3 similar comments
@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-test-main

@chrischdi
Copy link
Member Author

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

1 similar comment
@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

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

@chrischdi chrischdi changed the title 🌱 [wip] e2e: Claim ip addresses dynamically so tests can run in parallel 🌱 e2e: Claim ip addresses dynamically so tests can run in parallel Jan 12, 2024
@chrischdi
Copy link
Member Author

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

Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Overall looks good!

test/e2e/anti_affinity_test.go Outdated Show resolved Hide resolved
test/e2e/anti_affinity_test.go Outdated Show resolved Hide resolved
test/e2e/capi_machine_deployment_rollout_test.go Outdated Show resolved Hide resolved
test/e2e/multivc_test.go Show resolved Hide resolved
Makefile Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
}
}

// Note: Copy-paste from CAPI below.
Copy link
Member

Choose a reason for hiding this comment

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

Makes sense for this PR and its cherry-picks. Let's follow-up and export this in core CAPI so we can get rid of the copy on CAPV main

test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/e2e_suite_test.go Show resolved Hide resolved
@sbueringer
Copy link
Member

@chrischdi Just fyi. Linked a related issue I created a while back in the PR description

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 16, 2024
test/e2e/e2e_suite_test.go Outdated Show resolved Hide resolved
@@ -92,3 +94,26 @@ func initVSphereSession() {
func terminateVSphereSession() {
Expect(vsphereClient.Logout(ctx)).To(Succeed())
}

func getClusterctlConfigVariable(clusterctlConfigPath, configVariable string) (string, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Also seems like something that we should make a util exported by CAPI (in a follow-up PR)

test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
test/e2e/ipam/ipamhelper.go Outdated Show resolved Hide resolved
@sbueringer
Copy link
Member

Mostly just nits

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

LGTM label has been added.

Git tree hash: 367e8e5b4c34c469f530117ca0706a18591fcdfb

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 23, 2024
@chrischdi
Copy link
Member Author

Rebased + squashed, no changes.

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

@sbueringer
Copy link
Member

Looks like you'll need another rebase

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2024
@chrischdi
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

/retest

@sbueringer
Copy link
Member

/lgtm

/assign @fabriziopandini

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

LGTM label has been added.

Git tree hash: 6a33ce22613f02e5b8ccf0db32e4d45dec49e5ab

@sbueringer
Copy link
Member

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-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

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-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test ?

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.

@sbueringer
Copy link
Member

/test pull-cluster-api-provider-vsphere-conformance-main

@chrischdi
Copy link
Member Author

@sbueringer / @fabriziopandini should we go on merging this? :-)

@sbueringer
Copy link
Member

Fine from my side. Not sure if Fabrizio wants to do another review

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.

great work!
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Jan 25, 2024
@k8s-ci-robot k8s-ci-robot merged commit d4e07cd into kubernetes-sigs:main Jan 25, 2024
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Jan 25, 2024
@chrischdi chrischdi deleted the pr-change-ip-reservation branch January 26, 2024 10:23
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. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Run e2e tests with higher concurrency
4 participants