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: fix kubetest to allow parallel execution on different clusters #10424

Merged

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Apr 11, 2024

What this PR does / why we need it:

Adjusts the kubetest.Run function to include the cluster name at the reportDir and at the report filename of ginkgo.

This should allow running kubetest.Run in parallel.

As of now one kubetest.Run would e.g. have overwritten the kubeconfig of the other as well as the junit reports, which may also have caused a race condition leading to the flaky dualstack tests (the only e2e prowjobs where we currently run kubetest in-parallel.

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 Apr 11, 2024
@chrischdi chrischdi changed the title test: fix kubetest to allow parallel execution on different clusters 🐛 test: fix kubetest to allow parallel execution on different clusters Apr 11, 2024
@chrischdi
Copy link
Member Author

Related to #8816

@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-build-main
  • /test pull-cluster-api-e2e-blocking-main
  • /test pull-cluster-api-e2e-conformance-ci-latest-main
  • /test pull-cluster-api-e2e-conformance-main
  • /test pull-cluster-api-e2e-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-upgrade-1-29-1-30-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main

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

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-blocking-main
  • pull-cluster-api-test-main
  • pull-cluster-api-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-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-dualstack-and-ipv6-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 Apr 11, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: aa095996c40f5300537ac2635a4e2e9457cee555

@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 Apr 11, 2024
@chrischdi
Copy link
Member Author

/retest

X509 flake

@chrischdi chrischdi changed the title 🐛 test: fix kubetest to allow parallel execution on different clusters 🐛 e2e: fix kubetest to allow parallel execution on different clusters Apr 11, 2024
@sbueringer
Copy link
Member

Modified PR description to retrigger "PR type" action

@k8s-ci-robot k8s-ci-robot merged commit db522fc into kubernetes-sigs:main Apr 12, 2024
39 of 40 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Apr 12, 2024
@chrischdi chrischdi deleted the pr-fix-kubetest-parallel branch April 12, 2024 05:06
@chrischdi
Copy link
Member Author

/cherry-pick release-1.7

@chrischdi
Copy link
Member Author

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #10426

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

@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #10427

In response to this:

/cherry-pick release-1.6

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

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot

@chrischdi: #10424 failed to apply on top of branch "release-1.5":

Applying: test: fix kubetest to allow parallel execution on different clusters
Using index info to reconstruct a base tree...
M	test/e2e/cluster_upgrade.go
M	test/e2e/k8s_conformance.go
M	test/e2e/quick_start_test.go
M	test/framework/kubetest/run.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/kubetest/run.go
Auto-merging test/e2e/quick_start_test.go
CONFLICT (content): Merge conflict in test/e2e/quick_start_test.go
Auto-merging test/e2e/k8s_conformance.go
CONFLICT (content): Merge conflict in test/e2e/k8s_conformance.go
Auto-merging test/e2e/cluster_upgrade.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 kubetest to allow parallel execution on different clusters
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.5

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.

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